gnome-control-center r9103 - trunk/capplets/default-applications

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 21:54:30 2008
New Revision: 9103
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9103&view=rev

Log:
+Fri Oct 24 17:54:17 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* gnome-da-capplet.c (main): Fix to use gtk_init_with_args() correctly.
+



Modified:
   trunk/capplets/default-applications/ChangeLog
   trunk/capplets/default-applications/gnome-da-capplet.c

Modified: trunk/capplets/default-applications/gnome-da-capplet.c
==============================================================================
--- trunk/capplets/default-applications/gnome-da-capplet.c	(original)
+++ trunk/capplets/default-applications/gnome-da-capplet.c	Fri Oct 24 21:54:30 2008
@@ -867,7 +867,7 @@
     GnomeDACapplet *capplet;
 
     gchar *start_page = NULL;
-    GOptionContext *option_context;
+    GError *err = NULL;
     GOptionEntry option_entries[] = {
         { "show-page",
           'p',
@@ -886,10 +886,11 @@
     textdomain (GETTEXT_PACKAGE);
 #endif
 
-    option_context = g_option_context_new (NULL);
-    g_option_context_add_main_entries (option_context, option_entries, GETTEXT_PACKAGE);
-
-    gtk_init_with_args (&argc, &argv, NULL, option_entries, NULL, NULL);
+    if (!gtk_init_with_args (&argc, &argv, "- GNOME Default Applications",
+			     option_entries, GETTEXT_PACKAGE, &err)) {
+	    g_printerr ("%s\n", err->message);
+	    return 1;
+    }
 
     glade_init ();