diff options
author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-11-04 02:45:49 +0800 |
---|---|---|
committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-11-04 02:45:49 +0800 |
commit | d29934cfb25a634d9dab747dbe1e3b0618b994d6 (patch) | |
tree | 65c725683a43c8b36f2e6d4b14573f84f9fa0035 /src | |
parent | 40ddec684ee39d68b2f1f513f71d5c0d3bfb83e1 (diff) | |
download | gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar.gz gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar.bz2 gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar.lz gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar.xz gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.tar.zst gsoc2013-empathy-d29934cfb25a634d9dab747dbe1e3b0618b994d6.zip |
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).
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@415 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'src')
-rw-r--r-- | src/empathy.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/empathy.c b/src/empathy.c index 5786cb7ae..e23795f72 100644 --- 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"); |