gnome-session r5146 - in trunk: . gnome-session splash tools

[kmaraas svn gnome org]

Author: kmaraas
Date: Mon Nov 10 08:00:37 2008
New Revision: 5146
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5146&view=rev

Log:
2008-11-10  Kjartan Maraas  <kmaraas gnome org>

	* gnome-session/gsm-util.c: (gsm_util_init_error):
	Format specifier warning fix.
	* splash/Makefile.am: Add GCONF_LIBS/GCONF_CFLAGS.
	* tools/gnome-session-save.c: (display_error):
	Format specifiers again.

Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-util.c
   trunk/splash/Makefile.am
   trunk/tools/gnome-session-save.c

Modified: trunk/gnome-session/gsm-util.c
==============================================================================
--- trunk/gnome-session/gsm-util.c	(original)
+++ trunk/gnome-session/gsm-util.c	Mon Nov 10 08:00:37 2008
@@ -137,7 +137,7 @@
                 if (!gtk_init_check (NULL, NULL)) {
                         /* Oh well, no X for you! */
                         g_printerr (_("Unable to start login session (and unable connect to the X server)"));
-                        g_printerr (msg);
+                        g_printerr ("%s", msg);
                         exit (1);
                 }
         }

Modified: trunk/splash/Makefile.am
==============================================================================
--- trunk/splash/Makefile.am	(original)
+++ trunk/splash/Makefile.am	Mon Nov 10 08:00:37 2008
@@ -3,11 +3,13 @@
 INCLUDES =					\
 	-I$(top_srcdir)/egg			\
 	$(DBUS_GLIB_CFLAGS)			\
+	$(GCONF_CFLAGS)				\
 	$(LIBGNOMEUI_CFLAGS)			\
 	$(STARTUP_NOTIFICATION_CFLAGS)
 
 LDADD =						\
 	$(top_builddir)/egg/libeggsmclient-gnome.la \
+	$(GCONF_LIBS)				\
 	$(LIBGNOMEUI_LIBS)
 
 helperdir = $(pkglibdir)/helpers

Modified: trunk/tools/gnome-session-save.c
==============================================================================
--- trunk/tools/gnome-session-save.c	(original)
+++ trunk/tools/gnome-session-save.c	Mon Nov 10 08:00:37 2008
@@ -82,7 +82,7 @@
                 GtkWidget *dialog;
 
                 dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
-                                                 GTK_BUTTONS_OK, message);
+                                                 GTK_BUTTONS_OK, "%s", message);
 
                 /*gtk_window_set_default_icon_name (GTK_STOCK_SAVE);*/