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

17 files changed, 37 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index c57e07d78..a71af590a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+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).
+
 2008-12-01  Alexander Larsson  <alexl@redhat.com>
 
 	* configure.in:
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.c b/cut-n-paste-code/libegg/eggtreemultidnd.c
index 3a7da919c..abb9b3b7d 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.c
+++ b/cut-n-paste-code/libegg/eggtreemultidnd.c
@@ -18,10 +18,7 @@
  */
 
 #include <string.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "eggtreemultidnd.h"
 
 #define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.h b/cut-n-paste-code/libegg/eggtreemultidnd.h
index 810d48ea7..3df69fbad 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.h
+++ b/cut-n-paste-code/libegg/eggtreemultidnd.h
@@ -20,9 +20,7 @@
 #ifndef __EGG_TREE_MULTI_DND_H__
 #define __EGG_TREE_MULTI_DND_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libnautilus-extension/nautilus-menu.c b/libnautilus-extension/nautilus-menu.c
index 8912ab8d2..36a19cb31 100644
--- a/libnautilus-extension/nautilus-menu.c
+++ b/libnautilus-extension/nautilus-menu.c
@@ -25,7 +25,7 @@
 #include "nautilus-menu.h"
 #include "nautilus-extension-i18n.h"
 
-#include <glib/glist.h>
+#include <glib.h>
 
 #define NAUTILUS_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_MENU, NautilusMenuPrivate))
 
diff --git a/libnautilus-private/nautilus-directory-notify.h b/libnautilus-private/nautilus-directory-notify.h
index 1d65c9172..52dcdfea4 100644
--- a/libnautilus-private/nautilus-directory-notify.h
+++ b/libnautilus-private/nautilus-directory-notify.h
@@ -22,7 +22,7 @@
    Author: Darin Adler <darin@bentspoon.com>
 */
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <libnautilus-private/nautilus-file.h>
 
 typedef struct {
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index dd3060ee9..29d2ffe2d 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -53,10 +53,10 @@
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <gdk/gdkdnd.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-private.h"
 #include "nautilus-desktop-icon-file.h"
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 615892159..e57f6af55 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -58,8 +58,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <glib/gurifuncs.h>
-#include <glib/gfileutils.h>
+#include <glib.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libxml/parser.h>
 #include <pwd.h>
diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h
index 5d37d2339..d6f5b2f1b 100644
--- a/libnautilus-private/nautilus-icon-info.h
+++ b/libnautilus-private/nautilus-icon-info.h
@@ -3,7 +3,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/libnautilus-private/nautilus-idle-queue.h b/libnautilus-private/nautilus-idle-queue.h
index 3446973d3..bd241e8b2 100644
--- a/libnautilus-private/nautilus-idle-queue.h
+++ b/libnautilus-private/nautilus-idle-queue.h
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_IDLE_QUEUE_H
 #define NAUTILUS_IDLE_QUEUE_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libnautilus-private/nautilus-monitor.h b/libnautilus-private/nautilus-monitor.h
index f1ff3c846..31e20beb4 100644
--- a/libnautilus-private/nautilus-monitor.h
+++ b/libnautilus-private/nautilus-monitor.h
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_MONITOR_H
 #define NAUTILUS_MONITOR_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 typedef struct NautilusMonitor NautilusMonitor;
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index d61d26936..3579023af 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -25,7 +25,7 @@
 #include "nautilus-search-engine-simple.h"
 
 #include <string.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <gio/gio.h>
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