Use single includes for gtk+

2009-03-31  Kjartan Maraas  <kmaraas@gnome.org>

	* gui/simple-chooser/gdm-host-chooser-dialog.h:
	* gui/simple-chooser/gdm-host-chooser-widget.h:
	* gui/simple-greeter/gdm-cell-renderer-timer.h:
	* gui/simple-greeter/gdm-chooser-widget.h:
	* gui/simple-greeter/gdm-language-chooser-dialog.h:
	* gui/simple-greeter/gdm-layout-chooser-dialog.h:
	* gui/simple-greeter/gdm-option-widget.h:
	* gui/simple-greeter/gdm-user-chooser-dialog.h:
	* gui/simple-greeter/gdm-user.h:
	* gui/simple-greeter/libnotificationarea/na-tray-manager.c:
	* gui/simple-greeter/libnotificationarea/na-tray-manager.h:
	* gui/simple-greeter/libnotificationarea/na-tray.h:
	* gui/simple-greeter/libnotificationarea/obox.c:
	* gui/simple-greeter/libnotificationarea/obox.h:
	* gui/user-switch-applet/gdm-entry-menu-item.h:
	Use single includes for gtk+

svn path=/trunk/; revision=6798

16 files changed, 34 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 260fc036..cdf9397d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-03-31  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gui/simple-chooser/gdm-host-chooser-dialog.h:
+	* gui/simple-chooser/gdm-host-chooser-widget.h:
+	* gui/simple-greeter/gdm-cell-renderer-timer.h:
+	* gui/simple-greeter/gdm-chooser-widget.h:
+	* gui/simple-greeter/gdm-language-chooser-dialog.h:
+	* gui/simple-greeter/gdm-layout-chooser-dialog.h:
+	* gui/simple-greeter/gdm-option-widget.h:
+	* gui/simple-greeter/gdm-user-chooser-dialog.h:
+	* gui/simple-greeter/gdm-user.h:
+	* gui/simple-greeter/libnotificationarea/na-tray-manager.c:
+	* gui/simple-greeter/libnotificationarea/na-tray-manager.h:
+	* gui/simple-greeter/libnotificationarea/na-tray.h:
+	* gui/simple-greeter/libnotificationarea/obox.c:
+	* gui/simple-greeter/libnotificationarea/obox.h:
+	* gui/user-switch-applet/gdm-entry-menu-item.h:
+	Use single includes for gtk+
+
 2009-03-27  Ray Strode  <rstrode@redhat.com>
 
 	Fix assorted compiler warnings.
diff --git a/gui/simple-chooser/gdm-host-chooser-dialog.h b/gui/simple-chooser/gdm-host-chooser-dialog.h
index ed2073ea..bf9408b8 100644
--- a/gui/simple-chooser/gdm-host-chooser-dialog.h
+++ b/gui/simple-chooser/gdm-host-chooser-dialog.h
@@ -22,7 +22,7 @@
 #define __GDM_HOST_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "gdm-chooser-host.h"
 
 G_BEGIN_DECLS
diff --git a/gui/simple-chooser/gdm-host-chooser-widget.h b/gui/simple-chooser/gdm-host-chooser-widget.h
index b15eba06..a95d5b45 100644
--- a/gui/simple-chooser/gdm-host-chooser-widget.h
+++ b/gui/simple-chooser/gdm-host-chooser-widget.h
@@ -22,7 +22,7 @@
 #define __GDM_HOST_CHOOSER_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdm-chooser-host.h"
 
 G_BEGIN_DECLS
diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.h b/gui/simple-greeter/gdm-cell-renderer-timer.h
index 58fb6886..f8ac2c1e 100644
--- a/gui/simple-greeter/gdm-cell-renderer-timer.h
+++ b/gui/simple-greeter/gdm-cell-renderer-timer.h
@@ -21,7 +21,7 @@
 #ifndef __GDM_CELL_RENDERER_TIMER_H
 #define __GDM_CELL_RENDERER_TIMER_H
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
index b73d1bbb..578e6139 100644
--- a/gui/simple-greeter/gdm-chooser-widget.h
+++ b/gui/simple-greeter/gdm-chooser-widget.h
@@ -23,7 +23,7 @@
 #define __GDM_CHOOSER_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-language-chooser-dialog.h b/gui/simple-greeter/gdm-language-chooser-dialog.h
index c0f41010..4f2d20d9 100644
--- a/gui/simple-greeter/gdm-language-chooser-dialog.h
+++ b/gui/simple-greeter/gdm-language-chooser-dialog.h
@@ -22,7 +22,7 @@
 #define __GDM_LANGUAGE_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-layout-chooser-dialog.h b/gui/simple-greeter/gdm-layout-chooser-dialog.h
index fa15be98..982e74e2 100644
--- a/gui/simple-greeter/gdm-layout-chooser-dialog.h
+++ b/gui/simple-greeter/gdm-layout-chooser-dialog.h
@@ -22,7 +22,7 @@
 #define __GDM_LAYOUT_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-option-widget.h b/gui/simple-greeter/gdm-option-widget.h
index 9da79af8..e8c87536 100644
--- a/gui/simple-greeter/gdm-option-widget.h
+++ b/gui/simple-greeter/gdm-option-widget.h
@@ -25,7 +25,7 @@
 #define __GDM_OPTION_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-user-chooser-dialog.h b/gui/simple-greeter/gdm-user-chooser-dialog.h
index 214c190b..a9d6f8f8 100644
--- a/gui/simple-greeter/gdm-user-chooser-dialog.h
+++ b/gui/simple-greeter/gdm-user-chooser-dialog.h
@@ -22,7 +22,7 @@
 #define __GDM_USER_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gui/simple-greeter/gdm-user.h b/gui/simple-greeter/gdm-user.h
index 4edd3baf..5c72b2fb 100644
--- a/gui/simple-greeter/gdm-user.h
+++ b/gui/simple-greeter/gdm-user.h
@@ -26,7 +26,7 @@
 #define __GDM_USER__ 1
 
 #include <sys/types.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
index 9c36e692..4842a917 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c
@@ -34,9 +34,7 @@
 #elif defined (GDK_WINDOWING_WIN32)
 #include <gdk/gdkwin32.h>
 #endif
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "na-marshal.h"
 
diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.h b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
index 4d4e7880..a1781a7a 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray-manager.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.h
@@ -24,7 +24,7 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
diff --git a/gui/simple-greeter/libnotificationarea/na-tray.h b/gui/simple-greeter/libnotificationarea/na-tray.h
index db6f058a..f67062b4 100644
--- a/gui/simple-greeter/libnotificationarea/na-tray.h
+++ b/gui/simple-greeter/libnotificationarea/na-tray.h
@@ -24,7 +24,7 @@
 #ifndef __NA_TRAY_H__
 #define __NA_TRAY_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
diff --git a/gui/simple-greeter/libnotificationarea/obox.c b/gui/simple-greeter/libnotificationarea/obox.c
index 526ce026..9fdf8429 100644
--- a/gui/simple-greeter/libnotificationarea/obox.c
+++ b/gui/simple-greeter/libnotificationarea/obox.c
@@ -27,8 +27,7 @@
 
 #include "obox.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 static void na_obox_size_request  (GtkWidget       *widget,
 				   GtkRequisition  *requisition);
diff --git a/gui/simple-greeter/libnotificationarea/obox.h b/gui/simple-greeter/libnotificationarea/obox.h
index 5995da46..b603e9c8 100644
--- a/gui/simple-greeter/libnotificationarea/obox.h
+++ b/gui/simple-greeter/libnotificationarea/obox.h
@@ -28,7 +28,7 @@
 #ifndef __NA_OBOX_H__
 #define __NA_OBOX_H__
 
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gui/user-switch-applet/gdm-entry-menu-item.h b/gui/user-switch-applet/gdm-entry-menu-item.h
index 586d58df..3031609f 100644
--- a/gui/user-switch-applet/gdm-entry-menu-item.h
+++ b/gui/user-switch-applet/gdm-entry-menu-item.h
@@ -20,7 +20,7 @@
 #ifndef __GDM_ENTRY_MENU_ITEM__
 #define __GDM_ENTRY_MENU_ITEM__
 
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS