fast-user-switch-applet r556 - in trunk: . src

[diegoe svn gnome org]

Author: diegoe
Date: Wed Nov 26 17:42:17 2008
New Revision: 556
URL: http://svn.gnome.org/viewvc/fast-user-switch-applet?rev=556&view=rev

Log:
Don't do single includes for GTK+/Glib

Bug #560767. Patch by Maxim Ermilov.

Modified:
   trunk/ChangeLog
   trunk/src/applet.c
   trunk/src/fusa-manager.c
   trunk/src/fusa-manager.h
   trunk/src/fusa-user-menu-item.c
   trunk/src/fusa-user-menu-item.h
   trunk/src/fusa-user.c
   trunk/src/fusa-user.h
   trunk/src/fusa-utils.c
   trunk/src/fusa-utils.h
   trunk/src/gdm-queue.h

Modified: trunk/src/applet.c
==============================================================================
--- trunk/src/applet.c	(original)
+++ trunk/src/applet.c	Wed Nov 26 17:42:17 2008
@@ -25,34 +25,17 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <gtk/gtkversion.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 #include <glade/glade-xml.h>
 
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-ui-util.h>
 
 #include <libgnome/gnome-init.h>
-#include <libgnomeui/gnome-help.h>
 
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>

Modified: trunk/src/fusa-manager.c
==============================================================================
--- trunk/src/fusa-manager.c	(original)
+++ trunk/src/fusa-manager.c	Wed Nov 26 17:42:17 2008
@@ -37,9 +37,7 @@
 
 #include <gdk/gdkx.h>
 
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <gio/gio.h>
 

Modified: trunk/src/fusa-manager.h
==============================================================================
--- trunk/src/fusa-manager.h	(original)
+++ trunk/src/fusa-manager.h	Wed Nov 26 17:42:17 2008
@@ -26,7 +26,7 @@
 #ifndef __FUSA_MANAGER_H__
 #define __FUSA_MANAGER_H__ 1
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 
 #include "fusa-display.h"
 #include "fusa-user.h"

Modified: trunk/src/fusa-user-menu-item.c
==============================================================================
--- trunk/src/fusa-user-menu-item.c	(original)
+++ trunk/src/fusa-user-menu-item.c	Wed Nov 26 17:42:17 2008
@@ -27,16 +27,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include "fusa-user-menu-item.h"
 

Modified: trunk/src/fusa-user-menu-item.h
==============================================================================
--- trunk/src/fusa-user-menu-item.h	(original)
+++ trunk/src/fusa-user-menu-item.h	Wed Nov 26 17:42:17 2008
@@ -25,7 +25,7 @@
 #ifndef __FUSA_USER_MENU_ITEM__
 #define __FUSA_USER_MENU_ITEM__ 1
 
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtk.h>
 
 #include "fusa-user.h"
 

Modified: trunk/src/fusa-user.c
==============================================================================
--- trunk/src/fusa-user.c	(original)
+++ trunk/src/fusa-user.c	Wed Nov 26 17:42:17 2008
@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 #include "fusa-manager-private.h"
 #include "fusa-user-private.h"

Modified: trunk/src/fusa-user.h
==============================================================================
--- trunk/src/fusa-user.h	(original)
+++ trunk/src/fusa-user.h	Wed Nov 26 17:42:17 2008
@@ -26,7 +26,7 @@
 #define __FUSA_USER__ 1
 
 #include <sys/types.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS

Modified: trunk/src/fusa-utils.c
==============================================================================
--- trunk/src/fusa-utils.c	(original)
+++ trunk/src/fusa-utils.c	Wed Nov 26 17:42:17 2008
@@ -21,13 +21,7 @@
 #include <config.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include "fusa-utils.h"
 

Modified: trunk/src/fusa-utils.h
==============================================================================
--- trunk/src/fusa-utils.h	(original)
+++ trunk/src/fusa-utils.h	Wed Nov 26 17:42:17 2008
@@ -21,7 +21,7 @@
 #ifndef __FUSA_UTILS_H__
 #define __FUSA_UTILS_H__ 1
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gdm-queue.h
==============================================================================
--- trunk/src/gdm-queue.h	(original)
+++ trunk/src/gdm-queue.h	Wed Nov 26 17:42:17 2008
@@ -23,7 +23,7 @@
 #ifndef __GDM_QUEUE_H__
 #define __GDM_QUEUE_H__ 1
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS