From 1c2c68aa78f47c6eeea30a252abc77ec7c6c9bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 24 Oct 2008 21:50:29 +0000 Subject: [PATCH] =?UTF-8?q?+Fri=20Oct=2024=2017:50:21=202008=20=20S=C3=B8r?= =?UTF-8?q?en=20Sandmann=20=20=20+=20+=09*=20gnome-mo?= =?UTF-8?q?use-properties.c=20(main):=20Use=20gtk=5Finit=5Fwith=5Fargs()?= =?UTF-8?q?=20+=09instead=20of=20gnome=5Fprogram=5Finit()=20+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=9102 --- capplets/mouse/ChangeLog | 5 +++++ capplets/mouse/gnome-mouse-properties.c | 22 ++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 2b9334445..e66078922 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 24 17:50:21 2008 Søren Sandmann + + * gnome-mouse-properties.c (main): Use gtk_init_with_args() + instead of gnome_program_init() + ==================== 2.24.0.1 ==================== 2008-07-08 Matthias Clasen diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index fa3c5f78b..0e9cf668d 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -25,8 +25,8 @@ #include +#include #include -#include #include #include #include @@ -427,12 +427,11 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changes int main (int argc, char **argv) { - GnomeProgram *program; GConfClient *client; GladeXML *dialog; GtkWidget *dialog_win, *w; - GOptionContext *context; gchar *start_page = NULL; + GError *err = NULL; GOptionEntry cap_options[] = { {"show-page", 'p', G_OPTION_FLAG_IN_MAIN, @@ -448,16 +447,12 @@ main (int argc, char **argv) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - context = g_option_context_new (_("- GNOME Mouse Preferences")); - g_option_context_add_main_entries (context, cap_options, - GETTEXT_PACKAGE); - - program = gnome_program_init ("gnome-mouse-properties", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, - NULL); - + if (!gtk_init_with_args (&argc, &argv, _("- GNOME Mouse Preferences"), cap_options, GETTEXT_PACKAGE, &err)) { + g_printerr (err->message); + + return 1; + } + capplet_init_stock_icons (); activate_settings_daemon (); @@ -503,7 +498,6 @@ main (int argc, char **argv) } g_object_unref (client); - g_object_unref (program); return 0; }