X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=56824e8e611cfa0132c2bf78646a15f4bbfecfa6;hb=7c6d1cac2fbb30b0dfc324cfffd515e086dce67a;hp=6cd5a5b11c87e64c3af05cc9c625e47e4b87720b;hpb=b97e7fdf6ff21beb8acd7e00a40695e426ef8956;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 6cd5a5b1..56824e8e 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -40,6 +40,7 @@ #include "ev-file-helpers.h" #include "ev-metadata-manager.h" #include "ev-utils.h" +#include "ev-stock-icons.h" #ifdef ENABLE_DBUS #include "ev-media-player-keys.h" @@ -50,8 +51,7 @@ #include "ev-application-service.h" #endif -static void ev_application_add_icon_path_for_screen (GdkScreen *screen); -static void ev_application_save_print_settings (EvApplication *application); +static void ev_application_save_print_settings (EvApplication *application); struct _EvApplication { GObject base_instance; @@ -385,48 +385,6 @@ get_find_string_from_args (GHashTable *args) return value ? g_value_get_string (value) : NULL; } -/** - * get_unlink_temp_file_from_args: - * @args: a #GHashTable with data passed to the application. - * - * It does look if the unlink-temp-file option has been passed from the command - * line returning it's boolean representation, otherwise it does return %FALSE. - * - * Returns: the boolean representation of the unlink-temp-file value or %FALSE - * in other case. - */ -static gboolean -get_unlink_temp_file_from_args (GHashTable *args) -{ - gboolean unlink_temp_file = FALSE; - GValue *value = NULL; - - g_assert (args != NULL); - - value = g_hash_table_lookup (args, "unlink-temp-file"); - if (value) { - unlink_temp_file = g_value_get_boolean (value); - } - - return unlink_temp_file; -} - -static const gchar * -get_print_settings_from_args (GHashTable *args) -{ - const gchar *print_settings = NULL; - GValue *value = NULL; - - g_assert (args != NULL); - - value = g_hash_table_lookup (args, "print-settings"); - if (value) { - print_settings = g_value_get_string (value); - } - - return print_settings; -} - /** * ev_application_open_window: * @application: The instance of the application. @@ -454,9 +412,9 @@ ev_application_open_window (EvApplication *application, } if (screen) { + ev_stock_icons_add_icons_path_for_screen (screen); gtk_window_set_screen (GTK_WINDOW (new_window), screen); } - ev_application_add_icon_path_for_screen (screen); if (!GTK_WIDGET_REALIZED (new_window)) gtk_widget_realize (new_window); @@ -545,37 +503,6 @@ ev_application_get_uri_window (EvApplication *application, const char *uri) return uri_window; } -static void -ev_application_add_icon_path_for_screen (GdkScreen *screen) -{ - GtkIconTheme *icon_theme; - - icon_theme = screen ? gtk_icon_theme_get_for_screen (screen) : gtk_icon_theme_get_default (); - if (icon_theme) { - gchar **path = NULL; - gint n_paths; - gint i; - gchar *ev_icons_path; - - /* GtkIconTheme will then look in Evince custom hicolor dir - * for icons as well as the standard search paths - */ - ev_icons_path = g_build_filename (DATADIR, "icons", NULL); - gtk_icon_theme_get_search_path (icon_theme, &path, &n_paths); - for (i = n_paths - 1; i >= 0; i--) { - if (g_ascii_strcasecmp (ev_icons_path, path[i]) == 0) - break; - } - - if (i < 0) - gtk_icon_theme_append_search_path (icon_theme, - ev_icons_path); - - g_free (ev_icons_path); - g_strfreev (path); - } -} - /** * ev_application_open_uri_at_dest: * @application: The instance of the application. @@ -583,7 +510,6 @@ ev_application_add_icon_path_for_screen (GdkScreen *screen) * @screen: Thee screen where the link will be shown. * @dest: The #EvLinkDest of the document. * @mode: The run mode of the window. - * @unlink_temp_file: The unlink_temp_file option value. * @timestamp: Current time value. */ void @@ -593,16 +519,12 @@ ev_application_open_uri_at_dest (EvApplication *application, EvLinkDest *dest, EvWindowRunMode mode, const gchar *search_string, - gboolean unlink_temp_file, - const gchar *print_settings, guint timestamp) { EvWindow *new_window; g_return_if_fail (uri != NULL); - ev_application_add_icon_path_for_screen (screen); - new_window = ev_application_get_uri_window (application, uri); if (new_window == NULL) { @@ -613,13 +535,14 @@ ev_application_open_uri_at_dest (EvApplication *application, new_window = EV_WINDOW (ev_window_new ()); } - if (screen) + if (screen) { + ev_stock_icons_add_icons_path_for_screen (screen); gtk_window_set_screen (GTK_WINDOW (new_window), screen); + } /* 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, search_string, - unlink_temp_file, print_settings); + ev_window_open_uri (new_window, uri, dest, mode, search_string); if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window))) gtk_widget_realize (GTK_WIDGET (new_window)); @@ -657,8 +580,6 @@ 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; if (args) { @@ -666,15 +587,11 @@ ev_application_open_uri (EvApplication *application, 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, search_string, - unlink_temp_file, - print_settings, timestamp); + timestamp); if (dest) g_object_unref (dest); @@ -693,7 +610,7 @@ 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, NULL, - FALSE, NULL, timestamp); + timestamp); } }