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

diff --git a/shell/main.c b/shell/main.c
index 64b86dfa..e0fc9933 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -35,9 +35,6 @@
 #include <libgnomeui/gnome-authentication-manager.h>
 #endif
 
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 #ifdef ENABLE_DBUS
 #include <dbus/dbus-glib-bindings.h>
 #endif
@@ -45,12 +42,15 @@
 #include "ev-stock-icons.h"
 #include "ev-job-queue.h"
 #include "ev-file-helpers.h"
+#include "ev-backends-manager.h"
 
 static gchar   *ev_page_label;
+static gchar   *ev_find_string;
 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[] =
@@ -59,7 +59,9 @@ static const GOptionEntry goption_options[] =
 	{ "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL },
 	{ "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 },
+	{ "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")},
 	{ "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,20 @@ 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 (ev_find_string) {
+		value = g_new0 (GValue, 1);
+		g_value_init (value, G_TYPE_STRING);
+		g_value_set_string (value, ev_find_string);
+
+		g_hash_table_insert (args, g_strdup ("find-string"), value);
+
+		g_free (ev_find_string);
+		ev_page_label = NULL;
 	}
 
 	if (fullscren_mode)
@@ -154,6 +170,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;
 }
 
@@ -172,10 +200,13 @@ load_files (const char **files,
 		char   *uri;
 		char   *label;
 		GValue *old = NULL;
+		GFile  *file;
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		file = g_file_new_for_commandline_arg (files[i]);
+		uri = g_file_get_uri (file);
+		g_object_unref (file);
 		
-		label = strchr (uri, GNOME_VFS_URI_MAGIC_CHR);
+		label = strchr (uri, '#');
 
 		if (label) {
 			GValue *new;
@@ -251,9 +282,13 @@ load_files_remote (const char **files,
 
 	for (i = 0; files[i]; i++) {
 		const char *page_label;
+		GFile *file;
 		char *uri;
 
-		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		file = g_file_new_for_commandline_arg (files[i]);
+		uri = g_file_get_uri (file);
+		g_object_unref (file);
+
 		page_label = ev_page_label ? ev_page_label : "";
 
 		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
@@ -290,6 +325,7 @@ main (int argc, char *argv[])
 #if WITH_GNOME
 	GnomeProgram *program;
 #else
+	char *accel_filename;
 	GError *error = NULL;
 #endif
 
@@ -301,6 +337,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
@@ -320,8 +357,9 @@ main (int argc, char *argv[])
 		return 1;
 	}
 	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 ();
@@ -344,6 +382,8 @@ main (int argc, char *argv[])
 	gnome_authentication_manager_init ();
 #endif
 
+	ev_backends_manager_init ();
+	
 	if (enable_metadata) {
 		ev_metadata_manager_init ();
 	}
@@ -362,6 +402,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 ();
@@ -370,6 +413,8 @@ main (int argc, char *argv[])
 		ev_metadata_manager_shutdown ();
 	}
 
+	ev_backends_manager_shutdown ();
+
 #if WITH_GNOME
  	g_object_unref (program);
 #endif