Apply patch from upstream, reported by Debian, backported by Christoph Mende to fix behavior of Cancel button. Bug 183803.

(Portage version: 2.1.3_rc6)

4 files changed, 70 insertions, 1 deletions

diff --git a/xfce-extra/xfce4-screenshooter/ChangeLog b/xfce-extra/xfce4-screenshooter/ChangeLog
index 85af2d070272..a5bef4416e66 100644
--- a/xfce-extra/xfce4-screenshooter/ChangeLog
+++ b/xfce-extra/xfce4-screenshooter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/xfce4-screenshooter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.10 2007/03/15 13:55:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.11 2007/07/01 17:26:45 drac Exp $
+
+*xfce4-screenshooter-1.0.0-r1 (01 Jul 2007)
+
+  01 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-screenshooter-1.0.0-cancel-save.patch,
+  +xfce4-screenshooter-1.0.0-r1.ebuild:
+  Apply patch from upstream, reported by Debian, backported by Christoph Mende
+  to fix behavior of Cancel button. Bug 183803.
 
   15 Mar 2007; Markus Rothe <corsair@gentoo.org>
   xfce4-screenshooter-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-screenshooter/files/digest-xfce4-screenshooter-1.0.0-r1 b/xfce-extra/xfce4-screenshooter/files/digest-xfce4-screenshooter-1.0.0-r1
new file mode 100644
index 000000000000..3652018d62d9
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/files/digest-xfce4-screenshooter-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 d12746c635eb28207161a3da1585aa75 xfce4-screenshooter-plugin-1.0.0.tar.bz2 257496
+RMD160 f454f968d51e259abc3f0a3d3e55eabc305e7813 xfce4-screenshooter-plugin-1.0.0.tar.bz2 257496
+SHA256 2ee31e2d74a2373da8ad44a1c2af3e323f199fbdb63ea31c070841d9487d41f2 xfce4-screenshooter-plugin-1.0.0.tar.bz2 257496
diff --git a/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.0.0-cancel-save.patch b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.0.0-cancel-save.patch
new file mode 100644
index 000000000000..d2e09ac718d6
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.0.0-cancel-save.patch
@@ -0,0 +1,38 @@
+diff -ur xfce4-screenshooter-plugin-1.0.0.orig/panel-plugin/screenshooter.c xfce4-screenshooter-plugin-1.0.0/panel-plugin/screenshooter.c
+--- xfce4-screenshooter-plugin-1.0.0.orig/panel-plugin/screenshooter.c	2006-04-23 20:12:15.000000000 +0300
++++ xfce4-screenshooter-plugin-1.0.0/panel-plugin/screenshooter.c	2007-07-01 20:17:09.000000000 +0300
+@@ -227,6 +227,7 @@
+ 
+     gint width;
+     gint height;
++    gint dialog_response;
+ 
+     gchar * filename = NULL;
+     gchar * basename = NULL;
+@@ -266,12 +267,14 @@
+     
+     gtk_image_set_from_pixbuf (GTK_IMAGE (sd->preview), thumbnail);
+     g_object_unref (thumbnail);
+-            filename = generate_filename_for_uri (xfce_file_chooser_get_current_folder(XFCE_FILE_CHOOSER (sd->chooser)));
++    filename = generate_filename_for_uri (xfce_file_chooser_get_current_folder(XFCE_FILE_CHOOSER (sd->chooser)));
+     
+     if (sd->ask_for_file && filename)
+     {    
+         gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (sd->chooser), filename);
+-        if (gtk_dialog_run (GTK_DIALOG (sd->chooser)) == GTK_RESPONSE_ACCEPT)
++        
++        dialog_response = gtk_dialog_run (GTK_DIALOG (sd->chooser));
++        if (dialog_response == GTK_RESPONSE_ACCEPT)
+         {    
+         filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(sd->chooser));
+         }
+@@ -289,7 +292,8 @@
+     }
+     
+     if (filename) {
+-        gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
++        if (!(sd->ask_for_file) || dialog_response == GTK_RESPONSE_ACCEPT) 
++            gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
+         g_free (filename);
+     }
+ }
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.0.0-r1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..b4d4b178d1ba
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.0.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.0.0-r1.ebuild,v 1.1 2007/07/01 17:26:45 drac Exp $
+
+inherit eutils xfce44
+
+xfce44
+
+DESCRIPTION="Xfce4 panel screenshooter plugin"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cancel-save.patch
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+xfce44_goodies_panel_plugin