From 70f641411b2fbab930b481ac844984819b48805d Mon Sep 17 00:00:00 2001
From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Sat, 13 May 2006 03:54:09 +0000
Subject: Bump requirements to gtk 2.8 and drop all idfefs used.

	* configure.ac:
	* properties/ev-properties-main.c: (ev_properties_get_pages):
	* shell/ev-application.c: (ev_application_open_window),
	(ev_application_open_uri_at_dest):
	* shell/ev-sidebar-attachments.c: (ev_sidebar_attachments_init):
	* shell/ev-sidebar-thumbnails.c: (adjustment_changed_cb),
	(ev_sidebar_thumbnails_use_icon_view), (page_changed_cb):
	* shell/ev-utils.c: (save_print_config_to_file):
	* shell/ev-window.c: (ev_window_cmd_save_as),
	(ev_attachment_popup_cmd_save_attachment_as):
	* shell/main.c: (load_files_remote):

	Bump requirements to gtk 2.8 and drop all idfefs used.
---
(limited to 'shell/ev-sidebar-thumbnails.c')

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index ac449d8..b454dd5 100644
--- 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) {
-#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;
-#else
-		g_assert_not_reached ();
-#endif
 	} else {
 		return;
 	}
@@ -495,14 +491,10 @@ ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_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;
-#else
-	return FALSE;
-#endif
 }
 
 static void
@@ -552,11 +544,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) {
-		/* 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);
-#endif
 	}
 
 	gtk_tree_path_free (path);
--
cgit v0.9.1