diff options
| author | Marek Kašík <mkasik@redhat.com> | 2008-11-18 23:15:12 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@src.gnome.org> | 2008-11-18 23:15:12 (GMT) |
| commit | a20cf6aaf721d5ad453ed704fd33707d9f72c60a (patch) | |
| tree | caf0bb72526de947efacaa24ddf9ddadc69a7445 /shell | |
| parent | 29779fdad02b1e06a2012180e77b090597e0c511 (diff) | |
Fixes assertion fail on selecting text. See bug #561393.
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.
svn path=/trunk/; revision=3271
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-pixbuf-cache.c | 9 | ||||
| -rw-r--r-- | shell/ev-window.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c index d9252fd..ffa0377 100644 --- a/shell/ev-pixbuf-cache.c +++ b/shell/ev-pixbuf-cache.c @@ -94,8 +94,8 @@ static gboolean new_selection_surface_needed(EvPixbufCache *pixbuf_cac /* 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 @@ ev_pixbuf_cache_clear_job_sizes (EvPixbufCache *pixbuf_cache, } } -#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_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache, 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; diff --git a/shell/ev-window.c b/shell/ev-window.c index ef96dce..99dece0 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4902,9 +4902,11 @@ static void 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 ()); |