Make use of gtk_init_with_args for command line parsing. Fixes bug #491985

2007-11-03  Xavier Claessens  <xclaesse@gmail.com>

	* src/empathy.c: Make use of gtk_init_with_args for command line
	parsing. Fixes bug #491985 (Basilio Kublik).

svn path=/trunk/; revision=415

diff --git a/ChangeLog b/ChangeLog
index 12698d74e592f82caa87b6f9f3e00b82c2917b1a..ec3dd166cd261ce300e92a07a989cdf0a0496f13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-03  Xavier Claessens  <xclaesse@gmail.com>
+
+       * src/empathy.c: Make use of gtk_init_with_args for command line
+       parsing. Fixes bug #491985 (Basilio Kublik).
+
 2007-11-03  Xavier Claessens  <xclaesse@gmail.com>
 
        * data/icons/hicolor_status_scalable_empathy-pending.svg:
@@ -15,6 +20,10 @@
        * data/icons/Makefile.am: Install SVG status images as scalable.
        Fixes bug #492984.
 
+2007-11-03  Xavier Claessens  <xclaesse@gmail.com>
+
+       * configure.ac: Bump version to 0.21.2.
+
 2007-10-28  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy-gtk/empathy-contact-list-view.c:

diff --git a/configure.ac b/configure.ac
index 95c79ffba52dd5480e1a9c12c5e1b0233789fd70..96f65bb0295dcace9c9318de6f9131878fcc1d2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.21.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.2, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB

diff --git a/src/empathy.c b/src/empathy.c
index 5786cb7ae7d7dfee1833740a89df93b4edfc01a3..e23795f72f6c8c83c4035eed7032fd4a3e5d2e5b 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -265,7 +265,7 @@ main (int argc, char *argv[])
        EmpathyIdle       *idle;
        EmpathyChandler   *chandler;
        gboolean           no_connect = FALSE;
-       GOptionContext    *context;
+       GError            *error = NULL;
        GOptionEntry       options[] = {
                { "no-connect", 'n',
                  0, G_OPTION_ARG_NONE, &no_connect,
@@ -280,12 +280,15 @@ main (int argc, char *argv[])
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
-       context = g_option_context_new (_("- Empathy Instant Messenger"));
-       g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+       if (!gtk_init_with_args (&argc, &argv,
+                                _("- Empathy Instant Messenger"),
+                                options, GETTEXT_PACKAGE, &error)) {
+               empathy_debug (DEBUG_DOMAIN, error->message);
+               return EXIT_FAILURE;
+       }
 
        g_set_application_name (PACKAGE_NAME);
 
-       gtk_init (&argc, &argv);
        gtk_window_set_default_icon_name ("empathy");
        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                           PKGDATADIR G_DIR_SEPARATOR_S "icons");