diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-01-26 20:30:43 (GMT) |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-01-26 20:30:43 (GMT) |
| commit | f4f0da024897ef5e9481ee693b8a5f284f29fe7c (patch) | |
| tree | deb20b86ed6981cab944a2f04dc051eb56c38d8c /shell | |
| parent | bc9bc3d3597afae8ef5a1d44e682066579cbaae8 (diff) | |
Use N_() in g_option_context_new(), not _().
It's safe to use GETTEXT_PACKAGE and setting the translation domain even
when NLS is disabled, so no need for this extra ifdef'd code.
Remove redundant gtk_init() call. Bug #569233.
svn path=/trunk/; revision=3385
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/shell/main.c b/shell/main.c index a6a95cf..60f92c7 100644 --- a/shell/main.c +++ b/shell/main.c @@ -323,26 +323,22 @@ main (int argc, char *argv[]) if (!g_thread_supported ()) g_thread_init (NULL); - context = g_option_context_new (_("GNOME Document Viewer")); - #ifdef ENABLE_NLS /* Initialize the i18n stuff */ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); +#endif + + context = g_option_context_new (N_("GNOME Document Viewer")); g_option_context_set_translation_domain(context, GETTEXT_PACKAGE); -#else - g_option_context_add_main_entries (context, goption_options, NULL); -#endif /* ENABLE_NLS */ + g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE); g_option_context_add_group (context, egg_sm_client_get_option_group ()); g_option_context_add_group (context, gtk_get_option_group (TRUE)); - gtk_init (&argc, &argv); - if (!g_option_context_parse (context, &argc, &argv, &error)) { - g_warning ("Cannot parse arguments: %s", error->message); + g_printerr ("Cannot parse arguments: %s", error->message); g_error_free (error); g_option_context_free (context); |