summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2007-01-23 19:31:59 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2007-01-23 19:31:59 +0000
commit073a564212e998762b5413698f3644a649fe0902 (patch)
treeec16aca4c6decf8efeea7442b4b51a9d649d4eb4 /media-gfx/gthumb
parentBump to version 0.8.3; bug 146408 (diff)
downloadgentoo-2-073a564212e998762b5413698f3644a649fe0902.tar.gz
gentoo-2-073a564212e998762b5413698f3644a649fe0902.tar.bz2
gentoo-2-073a564212e998762b5413698f3644a649fe0902.zip
Include zoom pref fix from bug #156342
(Portage version: 2.1.2-r2)
Diffstat (limited to 'media-gfx/gthumb')
-rw-r--r--media-gfx/gthumb/ChangeLog6
-rw-r--r--media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch34
-rw-r--r--media-gfx/gthumb/gthumb-2.8.1.ebuild7
3 files changed, 44 insertions, 3 deletions
diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 9c1ac9dbcb6e..a594a4cf65ea 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/gthumb
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.60 2007/01/23 19:15:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.61 2007/01/23 19:31:59 dang Exp $
+
+ 23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+ +files/gthumb-2.8.1-respect-zoom-pref.patch, gthumb-2.8.1.ebuild:
+ Include zoom pref fix from bug #156342
23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
Bump to 2.8.1
diff --git a/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch b/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch
new file mode 100644
index 000000000000..7c2ac5622a1a
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch
@@ -0,0 +1,34 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN gthumb-2.8.1.orig/src/gth-fullscreen.c gthumb-2.8.1/src/gth-fullscreen.c
+--- gthumb-2.8.1.orig/src/gth-fullscreen.c 2006-08-17 12:16:45.000000000 -0400
++++ gthumb-2.8.1/src/gth-fullscreen.c 2007-01-23 14:17:54.000000000 -0500
+@@ -1468,6 +1468,7 @@ gth_fullscreen_construct (GthFullscreen
+ {
+ GthFullscreenPrivateData *priv = fullscreen->priv;
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (fullscreen));
++ GthZoomChange zoom_change = pref_get_zoom_change ();
+
+ gtk_window_set_default_size (GTK_WINDOW (fullscreen),
+ gdk_screen_get_width (screen),
+@@ -1495,7 +1496,7 @@ gth_fullscreen_construct (GthFullscreen
+ image_viewer_set_zoom_quality (IMAGE_VIEWER (priv->viewer),
+ pref_get_zoom_quality ());
+ image_viewer_set_zoom_change (IMAGE_VIEWER (priv->viewer),
+- GTH_ZOOM_CHANGE_FIT_IF_LARGER);
++ zoom_change);
+ image_viewer_set_check_type (IMAGE_VIEWER (priv->viewer),
+ pref_get_check_type ());
+ image_viewer_set_check_size (IMAGE_VIEWER (priv->viewer),
+@@ -1504,7 +1505,12 @@ gth_fullscreen_construct (GthFullscreen
+ pref_get_transp_type ());
+ image_viewer_set_black_background (IMAGE_VIEWER (priv->viewer), TRUE);
+ image_viewer_hide_frame (IMAGE_VIEWER (priv->viewer));
+- image_viewer_zoom_to_fit_if_larger (IMAGE_VIEWER (priv->viewer));
++ if(zoom_change == GTH_ZOOM_CHANGE_ACTUAL_SIZE)
++ image_viewer_set_zoom (IMAGE_VIEWER (priv->viewer), 1.0);
++ else if(zoom_change == GTH_ZOOM_CHANGE_FIT)
++ image_viewer_zoom_to_fit (IMAGE_VIEWER (priv->viewer));
++ else
++ image_viewer_zoom_to_fit_if_larger (IMAGE_VIEWER (priv->viewer));
+
+ g_signal_connect (G_OBJECT (priv->viewer),
+ "key_press_event",
diff --git a/media-gfx/gthumb/gthumb-2.8.1.ebuild b/media-gfx/gthumb/gthumb-2.8.1.ebuild
index 918702c2ff21..777832894edf 100644
--- a/media-gfx/gthumb/gthumb-2.8.1.ebuild
+++ b/media-gfx/gthumb/gthumb-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.1 2007/01/23 19:15:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.2 2007/01/23 19:31:59 dang Exp $
inherit gnome2 eutils autotools
@@ -49,5 +49,8 @@ src_unpack() {
# New as-needed, including gphoto fixes
epatch "${FILESDIR}"/${PN}-2.8.1-as-needed.patch
+ # Respect zoom preferences. Bug #156342
+ epatch "${FILESDIR}"/${PN}-2.8.1-respect-zoom-pref.patch
+
eautoreconf
}