diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-sidebar-thumbnails.c | 15 | ||||
| -rw-r--r-- | shell/main.c | 21 |
2 files changed, 13 insertions, 23 deletions
diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 72c365ec..05a9049f 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -581,8 +581,6 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; GtkTreeIter iter; int i; - gint prev_width = -1; - gint prev_height = -1; for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) { gchar *page_label; @@ -593,16 +591,11 @@ ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) page_label = ev_document_get_page_label (priv->document, i); page_string = g_markup_printf_escaped ("<i>%s</i>", page_label); ev_thumbnails_size_cache_get_size (sidebar_thumbnails->priv->size_cache, i, - sidebar_thumbnails->priv->rotation, - &width, &height); - if (!loading_icon || (width != prev_width && height != prev_height)) { - loading_icon = - ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails, - width, height); - } + sidebar_thumbnails->priv->rotation, + &width, &height); - prev_width = width; - prev_height = height; + loading_icon = ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails, + width, height); gtk_list_store_append (priv->list_store, &iter); gtk_list_store_set (priv->list_store, &iter, diff --git a/shell/main.c b/shell/main.c index 582ffe2f..d85876be 100644 --- a/shell/main.c +++ b/shell/main.c @@ -80,10 +80,11 @@ static const GOptionEntry goption_options[] = static gboolean launch_previewer (void) { - GString *cmd_str; - gchar *cmd; - gboolean retval = FALSE; - GError *error = NULL; + GString *cmd_str; + gchar *cmd; + GAppInfo *app; + gboolean retval = FALSE; + GError *error = NULL; /* Rebuild the command line, ignoring options * not supported by the previewer and taking only @@ -112,15 +113,11 @@ launch_previewer (void) cmd = g_string_free (cmd_str, FALSE); - if (!error) { - GAppInfo *app; + app = g_app_info_create_from_commandline (cmd, NULL, 0, &error); - app = g_app_info_create_from_commandline (cmd, NULL, 0, &error); - - if (app != NULL) { - retval = g_app_info_launch (app, NULL, NULL, &error); - g_object_unref (app); - } + if (app != NULL) { + retval = g_app_info_launch (app, NULL, NULL, &error); + g_object_unref (app); } if (error) { |