evince r3385 - trunk/shell

[chpe svn gnome org]

Author: chpe
Date: Mon Jan 26 20:30:43 2009
New Revision: 3385
URL: http://svn.gnome.org/viewvc/evince?rev=3385&view=rev

Log:
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.

Modified:
   trunk/shell/main.c

Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c	(original)
+++ trunk/shell/main.c	Mon Jan 26 20:30:43 2009
@@ -323,26 +323,22 @@
 	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);