From 2f8de6c511c78d3db9cf8b7986181fe6a7da7801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Fri, 24 Oct 2008 22:22:58 +0000 Subject: [PATCH] =?UTF-8?q?=3D=3D>=20common/ChangeLog=20<=3D=3D=20Fri=20Oc?= =?UTF-8?q?t=2024=2018:22:06=202008=20=20S=C3=B8ren=20Sandmann=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * capplet-util.[ch]: Add new capplet_init() function ==> default-applications/ChangeLog <== Fri Oct 24 18:22:22 2008 Søren Sandmann * gnome-da-capplet.c (main): Use new capplet_init() function svn path=/trunk/; revision=9105 --- capplets/common/ChangeLog | 4 ++++ capplets/common/capplet-util.c | 24 +++++++++++++++++++ capplets/common/capplet-util.h | 1 + capplets/default-applications/ChangeLog | 4 ++++ .../default-applications/gnome-da-capplet.c | 15 ++++-------- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 7d6588e41..c4c387468 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 24 18:22:06 2008 Søren Sandmann + + * capplet-util.[ch]: Add new capplet_init() function + Fri Oct 24 17:21:56 2008 Søren Sandmann * capplet-stock-icons.c (capplet_register_stock_icons): Get rid of diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index f7a03191d..611547b93 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -179,3 +179,27 @@ capplet_file_delete_recursive (GFile *file, GError **error) 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); +} diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index 714028cb4..11b39ce7b 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -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 */ diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 41c5b871f..6308b0acf 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 24 18:22:22 2008 Søren Sandmann + + * gnome-da-capplet.c (main): Use new capplet_init() function + Fri Oct 24 17:54:17 2008 Søren Sandmann * gnome-da-capplet.c (main): Fix to use gtk_init_with_args() correctly. diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c index 23895db4e..a507361b7 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; - GError *err = NULL; + GOptionContext *context; GOptionEntry option_entries[] = { { "show-page", 'p', @@ -880,17 +880,10 @@ main (int argc, char **argv) { NULL } }; -#ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); -#endif + context = g_option_context_new (_("- GNOME Default Applications")); + g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE); - if (!gtk_init_with_args (&argc, &argv, "- GNOME Default Applications", - option_entries, GETTEXT_PACKAGE, &err)) { - g_printerr ("%s\n", err->message); - return 1; - } + capplet_init (context, &argc, &argv); glade_init ();