r20725 - in /desktop/unstable/evince/debian: changelog control control.in patches/01_fix_last_page_in_presentations.patch

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Thu Jul 16 10:06:06 2009
New Revision: 20725

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20725
Log:
* debian/patches/01_fix_last_page_in_presentations.patch: Backport
  change from upstream to fix last page in presentation mode being
  skipped. Closes: #537156.
* Standards-Version is 3.8.2, no changes needed.

Added:
    desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control
    desktop/unstable/evince/debian/control.in

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=20725&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog (original)
+++ desktop/unstable/evince/debian/changelog Thu Jul 16 10:06:06 2009
@@ -1,6 +1,10 @@
 evince (2.26.2-2) UNRELEASED; urgency=low
 
   * debian/patches/60_gzdvi-support.patch: forwarded, add headers.
+  * debian/patches/01_fix_last_page_in_presentations.patch: Backport
+    change from upstream to fix last page in presentation mode being
+    skipped. Closes: #537156.
+  * Standards-Version is 3.8.2, no changes needed.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 07 Jul 2009 21:58:03 +0200
 

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=20725&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control (original)
+++ desktop/unstable/evince/debian/control Thu Jul 16 10:06:06 2009
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
                intltool (>= 0.35.0),
@@ -26,7 +26,7 @@
                libkpathsea-dev,
                libt1-dev,
                autotools-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.gnome.org/projects/evince/
 
 Package: evince

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=20725&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in (original)
+++ desktop/unstable/evince/debian/control.in Thu Jul 16 10:06:06 2009
@@ -26,7 +26,7 @@
                libkpathsea-dev,
                libt1-dev,
                autotools-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.gnome.org/projects/evince/
 
 Package: evince

Added: desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch?rev=20725&op=file
==============================================================================
--- desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch (added)
+++ desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch Thu Jul 16 10:06:06 2009
@@ -1,0 +1,61 @@
+Description: see below
+Origin: upstream
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=583652
+Bug-Debian: http://bugs.debian.org/537156
+
+
+From c493eb6c33fd49abd66f1e5f4dfc208776302594 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Mon, 08 Jun 2009 14:24:32 +0000
+Subject: [libview] Fix page transitions in presentation mode
+
+Set the destination surface as soon as possible when starting a page
+transition animation. Fixes bgo#583652 and bgo#581881.
+---
+diff --git a/libview/ev-transition-animation.c b/libview/ev-transition-animation.c
+index efcb509..7e33023 100644
+--- a/libview/ev-transition-animation.c
++++ b/libview/ev-transition-animation.c
+@@ -635,6 +635,9 @@ ev_transition_animation_set_origin_surface (EvTransitionAnimation *animation,
+ 
+ 	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
+ 
++	if (priv->origin_surface == origin_surface)
++		return;
++
+ 	surface = cairo_surface_reference (origin_surface);
+ 
+ 	if (priv->origin_surface)
+@@ -658,6 +661,9 @@ ev_transition_animation_set_dest_surface (EvTransitionAnimation *animation,
+ 
+ 	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
+ 
++	if (priv->dest_surface == dest_surface)
++		return;
++
+ 	surface = cairo_surface_reference (dest_surface);
+ 
+ 	if (priv->dest_surface)
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index 7626f86..80f8005 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -4161,10 +4161,14 @@ ev_view_presentation_animation_start (EvView *view,
+ 	if (!effect)
+ 		return;
+ 
+-	surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page);
+ 	view->animation = ev_transition_animation_new (effect);
++
++	surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page);
+ 	ev_transition_animation_set_origin_surface (view->animation, surface);
+-		
++	surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, new_page);
++	if (surface)
++		ev_transition_animation_set_dest_surface (view->animation, surface);
++
+ 	g_signal_connect (view->animation, "frame",
+ 			  G_CALLBACK (ev_view_transition_animation_frame), view);
+ 	g_signal_connect (view->animation, "finished",
+--
+cgit v0.8.2