+Fri Oct 24 17:50:21 2008 Søren Sandmann <sandmann@redhat.com>
+ + * gnome-mouse-properties.c (main): Use gtk_init_with_args() + instead of gnome_program_init() + svn path=/trunk/; revision=9102
This commit is contained in:
parent
22c99b375b
commit
1c2c68aa78
2 changed files with 13 additions and 14 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Fri Oct 24 17:50:21 2008 Søren Sandmann <sandmann@redhat.com>
|
||||||
|
|
||||||
|
* gnome-mouse-properties.c (main): Use gtk_init_with_args()
|
||||||
|
instead of gnome_program_init()
|
||||||
|
|
||||||
==================== 2.24.0.1 ====================
|
==================== 2.24.0.1 ====================
|
||||||
|
|
||||||
2008-07-08 Matthias Clasen <mclasen@redhat.com>
|
2008-07-08 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <glib/gi18n.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <gnome.h>
|
|
||||||
#include <gconf/gconf-client.h>
|
#include <gconf/gconf-client.h>
|
||||||
#include <glade/glade.h>
|
#include <glade/glade.h>
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
|
@ -427,12 +427,11 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changes
|
||||||
int
|
int
|
||||||
main (int argc, char **argv)
|
main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
GnomeProgram *program;
|
|
||||||
GConfClient *client;
|
GConfClient *client;
|
||||||
GladeXML *dialog;
|
GladeXML *dialog;
|
||||||
GtkWidget *dialog_win, *w;
|
GtkWidget *dialog_win, *w;
|
||||||
GOptionContext *context;
|
|
||||||
gchar *start_page = NULL;
|
gchar *start_page = NULL;
|
||||||
|
GError *err = NULL;
|
||||||
|
|
||||||
GOptionEntry cap_options[] = {
|
GOptionEntry cap_options[] = {
|
||||||
{"show-page", 'p', G_OPTION_FLAG_IN_MAIN,
|
{"show-page", 'p', G_OPTION_FLAG_IN_MAIN,
|
||||||
|
@ -448,15 +447,11 @@ main (int argc, char **argv)
|
||||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||||
textdomain (GETTEXT_PACKAGE);
|
textdomain (GETTEXT_PACKAGE);
|
||||||
|
|
||||||
context = g_option_context_new (_("- GNOME Mouse Preferences"));
|
if (!gtk_init_with_args (&argc, &argv, _("- GNOME Mouse Preferences"), cap_options, GETTEXT_PACKAGE, &err)) {
|
||||||
g_option_context_add_main_entries (context, cap_options,
|
g_printerr (err->message);
|
||||||
GETTEXT_PACKAGE);
|
|
||||||
|
|
||||||
program = gnome_program_init ("gnome-mouse-properties", VERSION,
|
return 1;
|
||||||
LIBGNOMEUI_MODULE, argc, argv,
|
}
|
||||||
GNOME_PARAM_GOPTION_CONTEXT, context,
|
|
||||||
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
capplet_init_stock_icons ();
|
capplet_init_stock_icons ();
|
||||||
|
|
||||||
|
@ -503,7 +498,6 @@ main (int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
g_object_unref (client);
|
g_object_unref (client);
|
||||||
g_object_unref (program);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue