* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "ev-application.h"
#include "ev-utils.h"
#include "ev-file-helpers.h"
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.
GdkScreen *screen,
EvLinkDest *dest,
EvWindowRunMode mode,
+ const gchar *search_string,
gboolean unlink_temp_file,
const gchar *print_settings,
guint timestamp)
/* 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 ();
{
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;
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)
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);
}
}
static void
ev_application_init (EvApplication *ev_application)
{
+ gint i;
+
#if WITH_GNOME
init_session (ev_application);
#endif
DATADIR"/evince-toolbar.xml");
}
+ /* Open item doesn't exist anymore,
+ * convert it to OpenRecent for compatibility
+ */
+ for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) {
+ const gchar *item;
+
+ item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i);
+ if (g_ascii_strcasecmp (item, "FileOpen") == 0) {
+ egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i);
+ egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i,
+ "FileOpenRecent");
+ ev_application_save_toolbars_model (ev_application);
+ break;
+ }
+ }
+
egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
- EGG_TB_MODEL_NOT_REMOVABLE);
+ EGG_TB_MODEL_NOT_REMOVABLE);
}
/**