evince r3271 - in trunk: . shell

[nshmyrev svn gnome org]

Author: nshmyrev
Date: Tue Nov 18 23:15:12 2008
New Revision: 3271
URL: http://svn.gnome.org/viewvc/evince?rev=3271&view=rev

Log:
2008-11-19  Marek KaÅÃk <mkasik redhat com>

	* shell/ev-pixbuf-cache.c (ev_pixbuf_cache_add_jobs_if_needed):
	* shell/ev-window.c (launch_external_uri):
	
	Fixes assertion fail on selecting text. See bug #561393.



Modified:
   trunk/ChangeLog
   trunk/shell/ev-pixbuf-cache.c
   trunk/shell/ev-window.c

Modified: trunk/shell/ev-pixbuf-cache.c
==============================================================================
--- trunk/shell/ev-pixbuf-cache.c	(original)
+++ trunk/shell/ev-pixbuf-cache.c	Tue Nov 18 23:15:12 2008
@@ -94,8 +94,8 @@
 
 
 /* These are used for iterating through the prev and next arrays */
-#define FIRST_VISABLE_PREV(pixbuf_cache) \
-	(MAX (0, pixbuf_cache->preload_cache_size + 1 - pixbuf_cache->start_page))
+#define FIRST_VISIBLE_PREV(pixbuf_cache) \
+	(MAX (0, pixbuf_cache->preload_cache_size - pixbuf_cache->start_page))
 #define VISIBLE_NEXT_LEN(pixbuf_cache, page_cache) \
 	(MIN(pixbuf_cache->preload_cache_size, ev_page_cache_get_n_pages (page_cache) - (1 + pixbuf_cache->end_page)))
 #define PAGE_CACHE_LEN(pixbuf_cache) \
@@ -593,9 +593,6 @@
 	}
 }
 
-#define FIRST_VISABLE_PREV(pixbuf_cache) \
-	(MAX (0, pixbuf_cache->preload_cache_size + 1 - pixbuf_cache->start_page))
-
 static void
 get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base)
 {
@@ -711,7 +708,7 @@
 				   EV_JOB_PRIORITY_URGENT);
 	}
 
-	for (i = FIRST_VISABLE_PREV(pixbuf_cache); i < pixbuf_cache->preload_cache_size; i++) {
+	for (i = FIRST_VISIBLE_PREV(pixbuf_cache); i < pixbuf_cache->preload_cache_size; i++) {
 		job_info = (pixbuf_cache->prev_job + i);
 		page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size + i;
 

Modified: trunk/shell/ev-window.c
==============================================================================
--- trunk/shell/ev-window.c	(original)
+++ trunk/shell/ev-window.c	Tue Nov 18 23:15:12 2008
@@ -4902,9 +4902,11 @@
 launch_external_uri (EvWindow *window, EvLinkAction *action)
 {
 	const gchar *uri = ev_link_action_get_uri (action);
-	GAppLaunchContext *context = NULL;
 	GError *error = NULL;
 	gboolean ret;
+#if GTK_CHECK_VERSION (2, 14, 0)
+	GAppLaunchContext *context = NULL;
+#endif
 
 #if GTK_CHECK_VERSION (2, 14, 0)
 	context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());