Merge lp:~zoe-gauthier/pitivi/gdk_cairo_reset_clip.lp537619 into lp:ubuntu/lucid/pitivi

[ooze]

This branches includes a fix for changing the parameters to a call to gtk.gdk.CairoContext.reset_clip. The call was missing the "cr" and "drawable" parameters.

In case PyGtk changes not to require the "cr" parameter (which is redundant with the "self" parameter), the explicit "cr" parameter would simply be ignored and not break this code.

C language documentation is available at http://library.gnome.org/devel/gdk/stable/gdk-Cairo-Interaction.html#gdk-cairo-reset-clip

[James Westby (james-w)]

Looks good, uploaded.

Thanks,

James

review: Approve

[ooze (zoe-gauthier)]

Sorry, the object passed to the "drawable" parameter was incorrect. It it fixed in a new version of the patch in the branch.

I also initially misunderstood the concept of requesting a merge in Launchpad; I only wanted to link the bug branch with the ubuntu branch for reviews. OTOH, the branch is retested and fixed to do what it was supposed to do.

[James Westby (james-w)]

On Tue, 06 Apr 2010 17:50:33 -0000, Philippe Gauthier <email address hidden> wrote:
> Sorry, the object passed to the "drawable" parameter was incorrect. It it fixed in a new version of the patch in the branch.

I uploaded the newer version, thanks.

> I also initially misunderstood the concept of requesting a merge in Launchpad; I only wanted to link the bug branch with the ubuntu branch for reviews. OTOH, the branch is retested and fixed to do what it was supposed to do.

Right, you can just link the branch and not create the merge
proposal. The other alternative is to create the merge proposal but set
the status to "Work In Progress", rather than "Needs Review"

Thanks,

James

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-10 22:03:38 +0000
+++ debian/changelog	2010-04-05 22:08:21 +0000
@@ -1,3 +1,10 @@
+pitivi (0.13.4-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/lp537619_gdk_cairo_reset_clip.patch: Use correct
+    parameters for gtk.gdk.CairoContext.reset_clip. (LP: #537619)
+
+ -- Philippe Gauthier <[e-mail]>  Mon, 05 Apr 2010 17:10:22 -0400
+
 pitivi (0.13.4-0ubuntu1) lucid; urgency=low
 
   * New upstream version:

=== added file 'debian/patches/lp537619_gdk_cairo_reset_clip.patch'
--- debian/patches/lp537619_gdk_cairo_reset_clip.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp537619_gdk_cairo_reset_clip.patch	2010-04-05 22:08:21 +0000
@@ -0,0 +1,12 @@
+diff -Nurp pitivi-0.13.4/pitivi/ui/curve.py pitivi-0.13.4-new/pitivi/ui/curve.py
+--- pitivi-0.13.4/pitivi/ui/curve.py	2010-02-19 11:17:24.000000000 -0500
++++ pitivi-0.13.4-new/pitivi/ui/curve.py	2010-04-05 17:06:41.233651709 -0400
+@@ -258,7 +258,7 @@ class Curve(goocanvas.ItemSimple, goocan
+                 bounds = intersect(self.bounds, bounds)
+                 width = bounds.x2 - bounds.x1
+                 height = bounds.y2 - bounds.y1
+-                cr.reset_clip()
++                cr.reset_clip(cr=cr, drawable=self.get_canvas())
+                 cr.rectangle(bounds.x1, bounds.y1, width, height)
+                 cr.clip()
+