Do not crash when adjustment page size is 0. Fixes bug #547440.

2008-08-17  Carlos Garcia Campos  <carlosgc@gnome.org>

	* shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb):

	Do not crash when adjustment page size is 0. Fixes bug #547440.

svn path=/trunk/; revision=3109

diff --git a/ChangeLog b/ChangeLog
index f33b2ce569a62bf9f6dc612a43e2b6b6d66cdeb5..581f5647e1c325d51c4424b3aab5152459bfe56c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-17  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb):
+
+       Do not crash when adjustment page size is 0. Fixes bug #547440.
+       
 2008-08-11  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * cut-n-paste/evmountoperation/ev-mount-operation.c:

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 0a97e5f782279e721c19f6e394175be8b3012e1c..2850514bc6345160c9d4764030c70b76864f730b 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -326,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,
@@ -346,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);