Updated Greek translation by Papadeas Pierros

[evince.git] / shell / ev-sidebar-thumbnails.c

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 74b4ab73d00b1609f8fc28674e0a892c9dda10d4..2850514bc6345160c9d4764030c70b76864f730b 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -27,16 +27,17 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtk.h>
+
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
+#include "ev-document-misc.h"
+#include "ev-document-thumbnails.h"
+#include "ev-job-scheduler.h"
 #include "ev-sidebar-page.h"
 #include "ev-sidebar-thumbnails.h"
-#include "ev-document-thumbnails.h"
-#include "ev-document-misc.h"
-#include "ev-job-queue.h"
-#include "ev-window.h"
 #include "ev-utils.h"
+#include "ev-window.h"
 
 #define THUMBNAIL_WIDTH 100
 
@@ -207,7 +208,7 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails,
 
                if (job) {
                        g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, sidebar_thumbnails);
-                       ev_job_queue_remove_job (EV_JOB (job));
+                       ev_job_cancel (EV_JOB (job));
                        g_object_unref (job);
                }
 
@@ -263,7 +264,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
                        job = ev_job_thumbnail_new (priv->document,
                                                    page, priv->rotation,
                                                    get_scale_for_page (sidebar_thumbnails, page));
-                       ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
+                       ev_job_scheduler_push_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
                        
                        g_object_set_data_full (G_OBJECT (job), "tree_iter",
                                                gtk_tree_iter_copy (&iter),
@@ -325,18 +326,21 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
        /* Widget is not currently visible */
        if (!GTK_WIDGET_MAPPED (sidebar_thumbnails))
                return;
+
+       if (priv->vadjustment->page_size == 0)
+               return;
        
        if (priv->tree_view) {
                if (! GTK_WIDGET_REALIZED (priv->tree_view))
                        return;
 
 #if GTK_CHECK_VERSION (2, 11, 3)
-               gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
-                                                                  0, (int) priv->vadjustment->value,
-                                                                  NULL, &wy1);
-               gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
-                                                                  0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
-                                                                  NULL, &wy2);
+               gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+                                                                0, (int) priv->vadjustment->value,
+                                                                NULL, &wy1);
+               gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+                                                                0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
+                                                                NULL, &wy2);
 #else
                gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view),
                                                     0, (int) priv->vadjustment->value,
@@ -345,7 +349,7 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
                                                     0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
                                                     NULL, &wy2);
 #endif /* GTK_CHECK_VERSION (2, 11, 3) */
-               
+
                gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view),
                                               1, wy1 + 1, &path,
                                               NULL, NULL, NULL);
@@ -688,8 +692,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage   *sidebar_page,
 
 static gboolean
 ev_sidebar_thumbnails_clear_job (GtkTreeModel *model,                                             
-                                GtkTreePath *path,                                                                                      
-                                GtkTreeIter *iter,                                                                                                                                   
+                                GtkTreePath *path,
+                                GtkTreeIter *iter,
                                 gpointer data)
 {
        EvJob *job;
@@ -697,7 +701,7 @@ ev_sidebar_thumbnails_clear_job (GtkTreeModel *model,
        gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1);
        
        if (job != NULL) {
-               ev_job_queue_remove_job (job);
+               ev_job_cancel (job);
                g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data);
                g_object_unref (job);
        }