summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2008-12-06 10:26:20 +0000
committerCosimo Cecchi <cosimoc@src.gnome.org>2008-12-06 10:26:20 +0000
commit7fce8f06d61ef1f76dd7b30055ae5a99f5953e87 (patch)
treeafcf550029350bfedfedcad0c4817f3d506b7e4f /src
parentf2c6d6fddfc4ecd5365bd6800930d04e023e722e (diff)
downloadnautilus-7fce8f06d61ef1f76dd7b30055ae5a99f5953e87.tar.gz
Use single GLib/GTK+ includes. Patch by Maxim Ermilov (#560432).
2008-12-06 Cosimo Cecchi <cosimoc@gnome.org> * cut-n-paste-code/libegg/eggtreemultidnd.c: * cut-n-paste-code/libegg/eggtreemultidnd.h: * libnautilus-extension/nautilus-menu.c: * libnautilus-private/nautilus-directory-notify.h: * libnautilus-private/nautilus-file-operations.c: * libnautilus-private/nautilus-file.c: * libnautilus-private/nautilus-icon-info.h: * libnautilus-private/nautilus-idle-queue.h: * libnautilus-private/nautilus-monitor.h: * libnautilus-private/nautilus-search-engine-simple.c: * src/file-manager/fm-list-model.c: * src/file-manager/fm-list-model.h: * src/file-manager/fm-list-view.c: * src/nautilus-emblem-sidebar.h: * src/nautilus-notebook.c: * src/nautilus-notebook.h: Use single GLib/GTK+ includes. Patch by Maxim Ermilov (#560432). svn path=/trunk/; revision=14797
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-list-model.c2
-rw-r--r--src/file-manager/fm-list-model.h2
-rw-r--r--src/file-manager/fm-list-view.c2
-rw-r--r--src/nautilus-emblem-sidebar.h2
-rw-r--r--src/nautilus-notebook.c10
-rw-r--r--src/nautilus-notebook.h2
6 files changed, 6 insertions, 14 deletions
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 39025bdc4..d9fe5e5b8 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -35,7 +35,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libnautilus-private/nautilus-dnd.h>
-#include <glib/gsequence.h>
+#include <glib.h>
enum {
SUBDIRECTORY_UNLOADED,
diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h
index 3957163d1..fd2a7620f 100644
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@@ -23,7 +23,7 @@
*/
#include <gtk/gtk.h>
-#include <gdk/gdkdnd.h>
+#include <gdk/gdk.h>
#include <libnautilus-private/nautilus-file.h>
#include <libnautilus-private/nautilus-directory.h>
#include <libnautilus-extension/nautilus-column.h>
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 3143612af..16cb49823 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -35,7 +35,7 @@
#include <eel/eel-vfs-extensions.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-macros.h>
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <libegg/eggtreemultidnd.h>
diff --git a/src/nautilus-emblem-sidebar.h b/src/nautilus-emblem-sidebar.h
index afe47b0a0..6e4ea463f 100644
--- a/src/nautilus-emblem-sidebar.h
+++ b/src/nautilus-emblem-sidebar.h
@@ -27,7 +27,7 @@
#ifndef NAUTILUS_EMBLEM_SIDEBAR_H
#define NAUTILUS_EMBLEM_SIDEBAR_H
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#define NAUTILUS_TYPE_EMBLEM_SIDEBAR \
(nautilus_emblem_sidebar_get_type ())
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index d1431ad3f..9a67ae5c0 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -36,15 +36,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
#define TAB_WIDTH_N_CHARS 15
diff --git a/src/nautilus-notebook.h b/src/nautilus-notebook.h
index df21edfe3..ec99b505e 100644
--- a/src/nautilus-notebook.h
+++ b/src/nautilus-notebook.h
@@ -28,7 +28,7 @@
#define NAUTILUS_NOTEBOOK_H
#include <glib.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
#include "nautilus-window-slot.h"
G_BEGIN_DECLS