[Pkg-xfce-commits] r6300 - in goodies/trunk/xfce4-screenshooter/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-01-05 21:41:24 +0000 (Thu, 05 Jan 2012)
New Revision: 6300

Added:
   goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch
   goodies/trunk/xfce4-screenshooter/debian/patches/series
Modified:
   goodies/trunk/xfce4-screenshooter/debian/changelog
Log:
* debian/patches:
  - 01_fix-crash-with-some-wms.patch: added, fix a crash that occurs with some
    wms, e.g. awesome, when taking a screenshot.  lp: #830920, Closes: #648739

Modified: goodies/trunk/xfce4-screenshooter/debian/changelog
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/changelog	2012-01-05 15:35:47 UTC (rev 6299)
+++ goodies/trunk/xfce4-screenshooter/debian/changelog	2012-01-05 21:41:24 UTC (rev 6300)
@@ -1,3 +1,11 @@
+xfce4-screenshooter (1.8.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-crash-with-some-wms.patch: added, fix a crash that occurs with some
+      wms, e.g. awesome, when taking a screenshot.  lp: #830920, Closes: #648739
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 05 Jan 2012 22:38:25 +0100
+
 xfce4-screenshooter (1.8.0-1) unstable; urgency=low
 
   * New upstream release.

Added: goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch	                        (rev 0)
+++ goodies/trunk/xfce4-screenshooter/debian/patches/01_fix-crash-with-some-wms.patch	2012-01-05 21:41:24 UTC (rev 6300)
@@ -0,0 +1,31 @@
+From d99765f43d36af5edf60277f5043eb7ae9c97088 Mon Sep 17 00:00:00 2001
+From: Bruno Ramos <brunoramos.lu at gmail.com>
+Date: Mon, 02 Jan 2012 22:20:09 +0000
+Subject: Fix crash with some WM (bug #8080).
+
+---
+diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
+index 830d460..52f7b5c 100644
+--- a/lib/screenshooter-capture.c
++++ b/lib/screenshooter-capture.c
+@@ -381,6 +381,18 @@ static GdkPixbuf
+                   rec_height += rectangle.y;
+                 }
+ 
++              if (rec_x < 0)
++                {
++                  rec_width = rec_width + rec_x;
++                  rec_x = 0;
++                }
++
++              if (rec_y < 0)
++                {
++                  rec_height = rec_height + rec_y;
++                  rec_y = 0;
++                }
++
+               if (x_orig + rec_x + rec_width > gdk_screen_width ())
+                 rec_width = gdk_screen_width () - x_orig - rec_x;
+ 
+--
+cgit v0.9.0.2

Added: goodies/trunk/xfce4-screenshooter/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-screenshooter/debian/patches/series	2012-01-05 21:41:24 UTC (rev 6300)
@@ -0,0 +1 @@
+01_fix-crash-with-some-wms.patch