From e03ccc6269d7e687b4f5a67a0c07a014f301930b Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sun, 25 Nov 2007 16:54:00 +0000
Subject: Add a command line option for search. Fixes bug #497710.

2007-11-25  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-application.[ch]: (get_find_string_from_args),
	(ev_application_open_uri_at_dest), (ev_application_open_uri),
	(ev_application_open_uri_list):
	* shell/ev-jobs.[ch]: (ev_job_load_dispose), (ev_job_load_new):
	* shell/ev-window.[ch]: (ev_window_load_job_cb),
	(ev_window_open_uri), (ev_window_cmd_file_open_copy_at_dest),
	(ev_window_cmd_recent_file_activate),
	(ev_window_open_recent_action_item_activated),
	(ev_window_print_send), (open_remote_link):
	* shell/main.c: (arguments_parse):
	Add a command line option for search. Fixes bug #497710.

svn path=/trunk/; revision=2746
---
(limited to 'shell/ev-application.c')

diff --git a/shell/ev-application.c b/shell/ev-application.c
index deac0ed..2be350e 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -322,6 +322,18 @@ get_destination_from_args (GHashTable *args)
 	return dest;
 }
 
+static const gchar *
+get_find_string_from_args (GHashTable *args)
+{
+	GValue *value = NULL;
+
+	g_assert (args != NULL);
+
+	value = g_hash_table_lookup (args, "find-string");
+	
+	return value ? g_value_get_string (value) : NULL;
+}
+
 /**
  * get_unlink_temp_file_from_args:
  * @args: a #GHashTable with data passed to the application.
@@ -520,6 +532,7 @@ ev_application_open_uri_at_dest (EvApplication  *application,
 				 GdkScreen      *screen,
 				 EvLinkDest     *dest,
 				 EvWindowRunMode mode,
+				 const gchar    *search_string,
 				 gboolean        unlink_temp_file,
 				 const gchar    *print_settings, 
 				 guint           timestamp)
@@ -545,7 +558,7 @@ ev_application_open_uri_at_dest (EvApplication  *application,
 
 	/* We need to load uri before showing the window, so
 	   we can restore window size without flickering */	
-	ev_window_open_uri (new_window, uri, dest, mode,
+	ev_window_open_uri (new_window, uri, dest, mode, search_string, 
 			    unlink_temp_file, print_settings);
 
 	ev_document_fc_mutex_lock ();
@@ -573,6 +586,7 @@ ev_application_open_uri (EvApplication  *application,
 {
 	EvLinkDest      *dest = NULL;
 	EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
+	const gchar     *search_string = NULL;
 	gboolean         unlink_temp_file = FALSE;
 	const gchar     *print_settings = NULL;
 	GdkScreen       *screen = NULL;
@@ -581,13 +595,15 @@ ev_application_open_uri (EvApplication  *application,
 		screen = get_screen_from_args (args);
 		dest = get_destination_from_args (args);
 		mode = get_window_run_mode_from_args (args);
+		search_string = get_find_string_from_args (args);
 		unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
 				    get_unlink_temp_file_from_args (args));
 		print_settings = get_print_settings_from_args (args);
 	}
 	
 	ev_application_open_uri_at_dest (application, uri, screen,
-					 dest, mode, unlink_temp_file,
+					 dest, mode, search_string,
+					 unlink_temp_file,
 					 print_settings, timestamp);
 
 	if (dest)
@@ -606,8 +622,8 @@ ev_application_open_uri_list (EvApplication *application,
 
 	for (l = uri_list; l != NULL; l = l->next) {
 		ev_application_open_uri_at_dest (application, (char *)l->data,
-						 screen, NULL, 0, FALSE,
-						 NULL, timestamp);
+						 screen, NULL, 0, NULL,
+						 FALSE, NULL, timestamp);
 	}
 }
 
--
cgit v0.9.1