gnome-settings-daemon r71 - in trunk: . src

[wbolster svn gnome org]

Author: wbolster
Date: Mon Jan 28 12:29:11 2008
New Revision: 71
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=71&view=rev

Log:
2008-01-28  Wouter Bolsterlee  <wbolster svn gnome org>

	* configure.ac:
	* src/main.c: (main):

	Initialize GnomeProgram to avoid critical warnings from
	libgnome. Fixes bug #509770.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/main.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 28 12:29:11 2008
@@ -47,6 +47,7 @@
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gmodule-2.0
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+        libgnome-2.0
 )
 AC_SUBST(SETTINGS_DAEMON_CFLAGS)
 AC_SUBST(SETTINGS_DAEMON_LIBS)

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Mon Jan 28 12:29:11 2008
@@ -27,6 +27,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <libgnome/libgnome.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib.h>
@@ -170,6 +171,7 @@
 main (int argc, char *argv[])
 {
         GnomeSettingsManager *manager;
+        GnomeProgram         *program;
         gboolean              res;
         GError               *error;
 
@@ -209,6 +211,10 @@
                 goto out;
         }
 
+        program = gnome_program_init(
+                PACKAGE, VERSION, LIBGNOME_MODULE,
+                argc, argv, GNOME_PARAM_NONE);
+
         manager = gnome_settings_manager_new (gconf_prefix);
 
         res = gnome_settings_manager_start (manager, &error);