gnome-session r4910 - in trunk: . compat egg gnome-session splash

[mccann svn gnome org]

Author: mccann
Date: Mon Aug  4 23:37:05 2008
New Revision: 4910
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4910&view=rev

Log:
2008-08-04  William Jon McCann  <jmccann redhat com>

	* compat/at-spi-registryd-wrapper.c:
	* egg/eggdesktopfile.c:
	* gnome-session/gsm-util.c:
	* gnome-session/gsm-util.h:
	* gnome-session/main.c:
	* splash/gnome-login-sound.c:
	* splash/gnome-session-splash.c:
	* splash/splash-window.h:
	Use single GTK+ includes
	Patch from: Wouter Bolsterlee <wbolster gnome org>
	Fixes #544830



Modified:
   trunk/ChangeLog
   trunk/compat/at-spi-registryd-wrapper.c
   trunk/egg/eggdesktopfile.c
   trunk/gnome-session/gsm-util.c
   trunk/gnome-session/gsm-util.h
   trunk/gnome-session/main.c
   trunk/splash/gnome-login-sound.c
   trunk/splash/gnome-session-splash.c
   trunk/splash/splash-window.h

Modified: trunk/compat/at-spi-registryd-wrapper.c
==============================================================================
--- trunk/compat/at-spi-registryd-wrapper.c	(original)
+++ trunk/compat/at-spi-registryd-wrapper.c	Mon Aug  4 23:37:05 2008
@@ -17,7 +17,6 @@
 
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
-#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 

Modified: trunk/egg/eggdesktopfile.c
==============================================================================
--- trunk/egg/eggdesktopfile.c	(original)
+++ trunk/egg/eggdesktopfile.c	Mon Aug  4 23:37:05 2008
@@ -31,9 +31,8 @@
 #include <unistd.h>
 
 #include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 struct EggDesktopFile {
   GKeyFile           *key_file;

Modified: trunk/gnome-session/gsm-util.c
==============================================================================
--- trunk/gnome-session/gsm-util.c	(original)
+++ trunk/gnome-session/gsm-util.c	Mon Aug  4 23:37:05 2008
@@ -27,8 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/goption.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include <dbus/dbus-glib.h>
 

Modified: trunk/gnome-session/gsm-util.h
==============================================================================
--- trunk/gnome-session/gsm-util.h	(original)
+++ trunk/gnome-session/gsm-util.h	Mon Aug  4 23:37:05 2008
@@ -20,6 +20,8 @@
 #ifndef __GSM_UTIL_H__
 #define __GSM_UTIL_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 gchar**   gsm_util_get_app_dirs         (void);

Modified: trunk/gnome-session/main.c
==============================================================================
--- trunk/gnome-session/main.c	(original)
+++ trunk/gnome-session/main.c	Mon Aug  4 23:37:05 2008
@@ -29,8 +29,7 @@
 
 #include <glib/gi18n.h>
 #include <glib/goption.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>

Modified: trunk/splash/gnome-login-sound.c
==============================================================================
--- trunk/splash/gnome-login-sound.c	(original)
+++ trunk/splash/gnome-login-sound.c	Mon Aug  4 23:37:05 2008
@@ -22,7 +22,8 @@
 
 #include <libgnome/libgnome.h>
 #include <gconf/gconf-client.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
+
 #include "eggsmclient-libgnomeui.h"
 
 /* FIXME: Move the sound file configuration into GConf and use

Modified: trunk/splash/gnome-session-splash.c
==============================================================================
--- trunk/splash/gnome-session-splash.c	(original)
+++ trunk/splash/gnome-session-splash.c	Mon Aug  4 23:37:05 2008
@@ -22,9 +22,8 @@
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 #include <gconf/gconf-client.h>
 

Modified: trunk/splash/splash-window.h
==============================================================================
--- trunk/splash/splash-window.h	(original)
+++ trunk/splash/splash-window.h	Mon Aug  4 23:37:05 2008
@@ -20,8 +20,7 @@
 #ifndef __GSM_SPLASH_WINDOW_H__
 #define __GSM_SPLASH_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 #define GSM_TYPE_SPLASH_WINDOW            (gsm_splash_window_get_type ())
 #define GSM_SPLASH_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSM_TYPE_SPLASH_WINDOW, GsmSplashWindow))