diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2008-12-09 15:48:12 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2008-12-09 15:48:12 +0000 |
| commit | 0837d3e2e28d423f2fed47a3031a4fe4797406ab (patch) | |
| tree | f510d39c0fa42e823c863fa2c02b82fa8a9822c0 /xfce-extra/xfce4-screenshooter | |
| parent | Propagate LDFLAGS, FFLAGS for newer scons, avoid parsing make.conf (diff) | |
| download | gentoo-2-0837d3e2e28d423f2fed47a3031a4fe4797406ab.tar.gz gentoo-2-0837d3e2e28d423f2fed47a3031a4fe4797406ab.tar.bz2 gentoo-2-0837d3e2e28d423f2fed47a3031a4fe4797406ab.zip | |
Removed unused patch
(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc7-00167-g24920a7 x86_64)
Diffstat (limited to 'xfce-extra/xfce4-screenshooter')
| -rw-r--r-- | xfce-extra/xfce4-screenshooter/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.0.0-cancel-save.patch | 38 |
2 files changed, 5 insertions, 39 deletions
diff --git a/xfce-extra/xfce4-screenshooter/ChangeLog b/xfce-extra/xfce4-screenshooter/ChangeLog index e7b39dd38f64..bc0462efa6e5 100644 --- a/xfce-extra/xfce4-screenshooter/ChangeLog +++ b/xfce-extra/xfce4-screenshooter/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/xfce4-screenshooter # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.41 2008/12/03 23:55:47 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.42 2008/12/09 15:48:11 angelos Exp $ + + 09 Dec 2008; Christoph Mende <angelos@gentoo.org> + -files/xfce4-screenshooter-1.0.0-cancel-save.patch: + Removed unused patch 03 Dec 2008; Christoph Mende <angelos@gentoo.org> -xfce4-screenshooter-1.2.0.ebuild, -xfce4-screenshooter-1.3.1.ebuild: 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 deleted file mode 100644 index d2e09ac718d6..000000000000 --- a/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.0.0-cancel-save.patch +++ /dev/null @@ -1,38 +0,0 @@ -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); - } - } |