[libegg] eggiconchooser: Use gtk/gtk.h includes.

[Murray Cumming <murrayc src gnome org>]

commit 7cbffed3b650dcfc9bafb1ba8175042156f0b5d6
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 12 10:50:20 2011 +0200

    eggiconchooser: Use gtk/gtk.h includes.
    
    However, this still won't build because it tries to use a custom
    GtkFileSytem.

 libegg/iconchooser/eggiconchooser.c        |    3 +--
 libegg/iconchooser/eggiconchooser.h        |    2 +-
 libegg/iconchooser/eggiconchooserbutton.c  |    6 +-----
 libegg/iconchooser/eggiconchooserbutton.h  |    2 +-
 libegg/iconchooser/eggiconchooserdefault.c |   22 +---------------------
 libegg/iconchooser/eggiconchooserdefault.h |    2 +-
 libegg/iconchooser/eggiconchooserdialog.h  |    2 +-
 libegg/iconchooser/eggiconchooserwidget.h  |    2 +-
 libegg/iconchooser/gtkfilechooserembed.c   |    2 +-
 libegg/iconchooser/gtkfilechooserembed.h   |    2 +-
 libegg/iconchooser/gtkfilechooserprivate.h |    2 +-
 libegg/iconchooser/prop-editor.h           |    2 +-
 12 files changed, 12 insertions(+), 37 deletions(-)
---
diff --git a/libegg/iconchooser/eggiconchooser.c b/libegg/iconchooser/eggiconchooser.c
index 11f50e0..85a9b62 100644
--- a/libegg/iconchooser/eggiconchooser.c
+++ b/libegg/iconchooser/eggiconchooser.c
@@ -25,8 +25,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkenums.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 #include "eggiconchoosertypebuiltins.h"
 #include "eggiconchooserprivate.h"
diff --git a/libegg/iconchooser/eggiconchooser.h b/libegg/iconchooser/eggiconchooser.h
index e4db1af..8143b65 100644
--- a/libegg/iconchooser/eggiconchooser.h
+++ b/libegg/iconchooser/eggiconchooser.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_ICON_CHOOSER_H__
 #define __EGG_ICON_CHOOSER_H__
 
-#include <gtk/gtkfilefilter.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/iconchooser/eggiconchooserbutton.c b/libegg/iconchooser/eggiconchooserbutton.c
index 0a1bd4f..84d4298 100644
--- a/libegg/iconchooser/eggiconchooserbutton.c
+++ b/libegg/iconchooser/eggiconchooserbutton.c
@@ -25,11 +25,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "eggiconchooserutils.h"
 #include "eggiconchooserdialog.h"
diff --git a/libegg/iconchooser/eggiconchooserbutton.h b/libegg/iconchooser/eggiconchooserbutton.h
index ca179a3..450e918 100644
--- a/libegg/iconchooser/eggiconchooserbutton.h
+++ b/libegg/iconchooser/eggiconchooserbutton.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_ICON_CHOOSER_BUTTON_H__
 #define __EGG_ICON_CHOOSER_BUTTON_H__ 1
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "eggiconchooser.h"
 
 G_BEGIN_DECLS
diff --git a/libegg/iconchooser/eggiconchooserdefault.c b/libegg/iconchooser/eggiconchooserdefault.c
index 68c7ab8..cafab4c 100644
--- a/libegg/iconchooser/eggiconchooserdefault.c
+++ b/libegg/iconchooser/eggiconchooserdefault.c
@@ -25,27 +25,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkfilechooserwidget.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include "eggiconchoosertypebuiltins.h"
 #include "egg-pixbuf-thumbnail.h"
diff --git a/libegg/iconchooser/eggiconchooserdefault.h b/libegg/iconchooser/eggiconchooserdefault.h
index afc4baa..0ec1cef 100644
--- a/libegg/iconchooser/eggiconchooserdefault.h
+++ b/libegg/iconchooser/eggiconchooserdefault.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_ICON_CHOOSER_DEFAULT_H__
 #define __EGG_ICON_CHOOSER_DEFAULT_H__ 1
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/iconchooser/eggiconchooserdialog.h b/libegg/iconchooser/eggiconchooserdialog.h
index 54909fb..48e91ad 100644
--- a/libegg/iconchooser/eggiconchooserdialog.h
+++ b/libegg/iconchooser/eggiconchooserdialog.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_ICON_CHOOSER_DIALOG_H__
 #define __EGG_ICON_CHOOSER_DIALOG_H__ 1
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "eggiconchooser.h"
 
 G_BEGIN_DECLS
diff --git a/libegg/iconchooser/eggiconchooserwidget.h b/libegg/iconchooser/eggiconchooserwidget.h
index f0cc3b8..45c490f 100644
--- a/libegg/iconchooser/eggiconchooserwidget.h
+++ b/libegg/iconchooser/eggiconchooserwidget.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_ICON_CHOOSER_WIDGET_H__
 #define __EGG_ICON_CHOOSER_WIDGET_H__ 1
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/iconchooser/gtkfilechooserembed.c b/libegg/iconchooser/gtkfilechooserembed.c
index 0034037..ebc983d 100644
--- a/libegg/iconchooser/gtkfilechooserembed.c
+++ b/libegg/iconchooser/gtkfilechooserembed.c
@@ -1,7 +1,7 @@
 
 #include <config.h>
 
-#include <gtk/gtkfilechooserwidget.h>
+#include <gtk/gtk.h>
 
 #include "gtkfilechooserembed.h"
 
diff --git a/libegg/iconchooser/gtkfilechooserembed.h b/libegg/iconchooser/gtkfilechooserembed.h
index 98b0ae5..475f2ba 100644
--- a/libegg/iconchooser/gtkfilechooserembed.h
+++ b/libegg/iconchooser/gtkfilechooserembed.h
@@ -21,7 +21,7 @@
 #ifndef __GTK_FILE_CHOOSER_EMBED_H__
 #define __GTK_FILE_CHOOSER_EMBED_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libegg/iconchooser/gtkfilechooserprivate.h b/libegg/iconchooser/gtkfilechooserprivate.h
index 70bef31..dfc674c 100644
--- a/libegg/iconchooser/gtkfilechooserprivate.h
+++ b/libegg/iconchooser/gtkfilechooserprivate.h
@@ -21,7 +21,7 @@
 #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
 #define __GTK_FILE_CHOOSER_PRIVATE_H__
 
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 #include <gtk/gtkfilesystem.h>
 
diff --git a/libegg/iconchooser/prop-editor.h b/libegg/iconchooser/prop-editor.h
index 1f86d9b..dbee3c5 100644
--- a/libegg/iconchooser/prop-editor.h
+++ b/libegg/iconchooser/prop-editor.h
@@ -16,7 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifndef __PROP_EDITOR_H__
 #define __PROP_EDITOR_H__