diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 8a62df6db..41c5b871f 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,7 @@
+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.
+
 Fri Oct 24 17:31:40 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* gnome-da-capplet.c (main): Replace use of gnome_program_init()
diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c
index 993b32418..23895db4e 100644
--- a/capplets/default-applications/gnome-da-capplet.c
+++ b/capplets/default-applications/gnome-da-capplet.c
@@ -867,7 +867,7 @@ main (int argc, char **argv)
     GnomeDACapplet *capplet;
 
     gchar *start_page = NULL;
-    GOptionContext *option_context;
+    GError *err = NULL;
     GOptionEntry option_entries[] = {
         { "show-page",
           'p',
@@ -886,10 +886,11 @@ main (int argc, char **argv)
     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 ();