gnome-control-center r9105 - in trunk/capplets: common default-applications

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 22:22:58 2008
New Revision: 9105
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9105&view=rev

Log:
==> common/ChangeLog <==
Fri Oct 24 18:22:06 2008  SÃren Sandmann  <sandmann redhat com>

	* capplet-util.[ch]: Add new capplet_init() function

==> default-applications/ChangeLog <==
Fri Oct 24 18:22:22 2008  SÃren Sandmann  <sandmann redhat com>

	* gnome-da-capplet.c (main): Use new capplet_init() function




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

Modified: trunk/capplets/common/capplet-util.c
==============================================================================
--- trunk/capplets/common/capplet-util.c	(original)
+++ trunk/capplets/common/capplet-util.c	Fri Oct 24 22:22:58 2008
@@ -179,3 +179,27 @@
 		return g_file_delete (file, NULL, error);
 }
 
+void
+capplet_init (GOptionContext *context,
+	      int *argc,
+	      char ***argv)
+{
+	GError *err = NULL;
+	
+#ifdef ENABLE_NLS
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+#endif
+	
+	if (context) {
+		g_option_context_add_group (context, gtk_get_option_group (TRUE));
+		
+		if (!g_option_context_parse (context, argc, argv, &err)) {
+			g_printerr ("%s\n", err->message);
+			exit (1);
+		}
+	}
+	
+	gtk_init (argc, argv);
+}

Modified: trunk/capplets/common/capplet-util.h
==============================================================================
--- trunk/capplets/common/capplet-util.h	(original)
+++ trunk/capplets/common/capplet-util.h	Fri Oct 24 22:22:58 2008
@@ -48,5 +48,6 @@
 void capplet_help (GtkWindow *parent, char const *section);
 void capplet_set_icon (GtkWidget *window, char const *icon_file_name);
 gboolean capplet_file_delete_recursive (GFile *directory, GError **error);
+void capplet_init (GOptionContext *context, int *argc, char ***argv);
 
 #endif /* __CAPPLET_UTIL_H */

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 22:22:58 2008
@@ -867,7 +867,7 @@
     GnomeDACapplet *capplet;
 
     gchar *start_page = NULL;
-    GError *err = NULL;
+    GOptionContext *context;
     GOptionEntry option_entries[] = {
         { "show-page",
           'p',
@@ -880,17 +880,10 @@
         { NULL }
     };
 
-#ifdef ENABLE_NLS
-    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-    textdomain (GETTEXT_PACKAGE);
-#endif
-
-    if (!gtk_init_with_args (&argc, &argv, "- GNOME Default Applications",
-			     option_entries, GETTEXT_PACKAGE, &err)) {
-	    g_printerr ("%s\n", err->message);
-	    return 1;
-    }
+    context = g_option_context_new (_("- GNOME Default Applications"));
+    g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
+
+    capplet_init (context, &argc, &argv);
 
     glade_init ();