X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=cd6429307bb559d59460af84d9e3221cbc71ea75;hb=084c2e5beb02de1e5ced358e782db12a502ea65b;hp=64b86dfa05c99826021289017183c736ece12df4;hpb=64153d3fe6c59d09f13131db5f376df550f966ac;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 64b86dfa..cd642930 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -51,6 +51,7 @@ static gboolean preview_mode = FALSE;
 static gboolean fullscren_mode = FALSE;
 static gboolean presentation_mode = FALSE;
 static gboolean unlink_temp_file = FALSE;
+static gchar   *print_settings;
 static const char **file_arguments = NULL;
 
 static const GOptionEntry goption_options[] =
@@ -60,6 +61,7 @@ static const GOptionEntry goption_options[] =
 	{ "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL },
 	{ "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL },
 	{ "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL },
+	{ "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL },
 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") },
 	{ NULL }
 };
@@ -127,6 +129,9 @@ arguments_parse (void)
 		g_value_set_string (value, ev_page_label);
 
 		g_hash_table_insert (args, g_strdup ("page-label"), value);
+
+		g_free (ev_page_label);
+		ev_page_label = NULL;
 	}
 
 	if (fullscren_mode)
@@ -154,6 +159,18 @@ arguments_parse (void)
 				     value);
 	}
 
+	if (mode == EV_WINDOW_MODE_PREVIEW && print_settings) {
+		value = g_new0 (GValue, 1);
+		g_value_init (value, G_TYPE_STRING);
+		g_value_set_string (value, print_settings);
+
+		g_hash_table_insert (args,
+				     g_strdup ("print-settings"),
+				     value);
+		g_free (print_settings);
+		print_settings = NULL;
+	}
+
 	return args;
 }
 
@@ -290,6 +307,7 @@ main (int argc, char *argv[])
 #if WITH_GNOME
 	GnomeProgram *program;
 #else
+	char *accel_filename;
 	GError *error = NULL;
 #endif
 
@@ -301,6 +319,7 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 	textdomain(GETTEXT_PACKAGE);
 	g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
+	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
 #else
 	g_option_context_add_main_entries (context, goption_options, NULL);
 #endif
@@ -322,6 +341,9 @@ main (int argc, char *argv[])
 	g_option_context_free (context);
 	
 	gnome_vfs_init ();
+
+	accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL);
+	gtk_accel_map_load (accel_filename);
 #endif
 
 	args = arguments_parse ();
@@ -362,6 +384,9 @@ main (int argc, char *argv[])
 
 #if WITH_GNOME
 	gnome_accelerators_sync ();
+#else
+	gtk_accel_map_save (accel_filename);
+	g_free (accel_filename);
 #endif
 
 	ev_file_helpers_shutdown ();