Add seb128

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

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index ac449d8399607416f7f59b2e46aaf9c375c91e65..ec831491b742fd709e605a9f943b77d4b62bdd81 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -307,14 +307,10 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
                                               1, wy2 -1, &path2,
                                               NULL, NULL, NULL);
        } else if (priv->icon_view) {
                                               1, wy2 -1, &path2,
                                               NULL, NULL, NULL);
        } else if (priv->icon_view) {

-#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE

                if (! GTK_WIDGET_REALIZED (priv->icon_view))
                        return;
                if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
                        return;
                if (! GTK_WIDGET_REALIZED (priv->icon_view))
                        return;
                if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
                        return;

-#else
-               g_assert_not_reached ();
-#endif

        } else {
                return;
        }
        } else {
                return;
        }


@@ -383,7 +379,6 @@ ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
 }
 void
 ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,
 }
 void
 ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,

-

                               int                  rotation)
 {
        sidebar_thumbnails->priv->rotation = rotation;
                               int                  rotation)
 {
        sidebar_thumbnails->priv->rotation = rotation;


@@ -495,14 +490,10 @@ ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails)
 static gboolean
 ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
 {
 static gboolean
 ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
 {

-#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE

        EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
        if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT)
                return FALSE;
        return TRUE;
        EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
        if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT)
                return FALSE;
        return TRUE;

-#else
-       return FALSE;
-#endif

 }
 
 static void
 }
 
 static void


@@ -552,11 +543,8 @@ page_changed_cb (EvPageCache         *page_cache,
                gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE);
                gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0);
        } else if (sidebar->priv->icon_view) {
                gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE);
                gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0);
        } else if (sidebar->priv->icon_view) {

-               /* Guard against gtk-2.6 */
-#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE 

                gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path);
                gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE);
                gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path);
                gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE);

-#endif

        }
 
        gtk_tree_path_free (path);
        }
 
        gtk_tree_path_free (path);


@@ -607,6 +595,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage   *sidebar_page,
                if (! priv->icon_view) {
                        ev_sidebar_init_icon_view (sidebar_thumbnails);
                        g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget");
                if (! priv->icon_view) {
                        ev_sidebar_init_icon_view (sidebar_thumbnails);
                        g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget");

+               } else {
+                       gtk_widget_queue_resize (priv->icon_view);

                }
        } else {
                if (priv->icon_view) {
                }
        } else {
                if (priv->icon_view) {