summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <jasmine.aura@gmail.com>2012-10-27 15:29:36 +0200
committerJasmine Hassan <jasmine.aura@gmail.com>2012-11-16 09:45:50 +0200
commitdf6ac41622e955bfc2e3d3d38624dceaf4436df5 (patch)
tree7c156a46c2ae9a4b78a869dd52856ea834561556
parent1915c80f583c8d09322bc0ed91159743b7ccaf56 (diff)
downloadcaja-df6ac41622e955bfc2e3d3d38624dceaf4436df5.tar.bz2
caja-df6ac41622e955bfc2e3d3d38624dceaf4436df5.tar.xz
[build] don't include marshals we don't own
http://git.gnome.org/browse/nautilus/commit/?id=8d07a73b28767b7c866fe403e9ac706b8affb8a2
-rw-r--r--libcaja-private/caja-directory.c1
-rw-r--r--libcaja-private/caja-icon-container.c1
-rw-r--r--src/caja-pathbar.c1
-rw-r--r--src/caja-window.c1
-rw-r--r--src/caja-zoom-control.c1
-rw-r--r--src/file-manager/fm-directory-view.c1
6 files changed, 0 insertions, 6 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 6479b38a..efcfc5ed 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -32,7 +32,6 @@
#include "caja-search-directory.h"
#include "caja-global-preferences.h"
#include "caja-lib-self-check-functions.h"
-#include "caja-marshal.h"
#include "caja-metadata.h"
#include "caja-desktop-directory.h"
#include "caja-vfs-directory.h"
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 8a92d3aa..f9b01311 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -43,7 +43,6 @@
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-art-extensions.h>
#include <eel/eel-editable-label.h>
-#include <eel/eel-marshal.h>
#include <eel/eel-string.h>
#include <eel/eel-canvas-rect-ellipse.h>
#include <gdk/gdkkeysyms.h>
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index 279f4cd5..dffd63ee 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -32,7 +32,6 @@
#include <libcaja-private/caja-global-preferences.h>
#include <libcaja-private/caja-icon-names.h>
#include <libcaja-private/caja-trash-monitor.h>
-#include <libcaja-private/caja-marshal.h>
#include <libcaja-private/caja-dnd.h>
#include <libcaja-private/caja-icon-dnd.h>
#include "caja-pathbar.h"
diff --git a/src/caja-window.c b/src/caja-window.c
index 9dcf3863..d7c4c2cc 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -42,7 +42,6 @@
#include "caja-navigation-window-pane.h"
#include "caja-src-marshal.h"
#include <eel/eel-debug.h>
-#include <eel/eel-marshal.h>
#include <eel/eel-gtk-macros.h>
#include <eel/eel-string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
index 5dc79518..685242dc 100644
--- a/src/caja-zoom-control.c
+++ b/src/caja-zoom-control.c
@@ -40,7 +40,6 @@
#include <gdk/gdkkeysyms.h>
#include <libcaja-private/caja-file-utilities.h>
#include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-marshal.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 6ed863bb..bd75951e 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -47,7 +47,6 @@
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
-#include <eel/eel-marshal.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>