Fix bug 170336. Thanks to doc|work at #gentoo-xfce for reporting..

(Portage version: 2.1.2.2)

4 files changed, 79 insertions, 1 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index f38bedefe4fe..e79d087ffa31 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.90 2007/03/10 16:46:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.91 2007/03/10 23:50:25 drac Exp $
+
+*xfce4-panel-4.4.0-r1 (10 Mar 2007)
+
+  10 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-panel-4.4.0-actions.patch, +xfce4-panel-4.4.0-r1.ebuild:
+  Fix bug 170336. Thanks to Dave O'Connor for reporting.
 
   10 Mar 2007; nixnut <nixnut@gentoo.org> xfce4-panel-4.4.0.ebuild:
   Stable on ppc wrt bug 169987
diff --git a/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1 b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1
new file mode 100644
index 000000000000..b6a88e44d63f
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 c46925d2df393dba8f16979ba87d4776 xfce4-panel-4.4.0.tar.bz2 818534
+RMD160 513f7edf39e0eb12ac029f923be895762fde973c xfce4-panel-4.4.0.tar.bz2 818534
+SHA256 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926 xfce4-panel-4.4.0.tar.bz2 818534
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
new file mode 100644
index 000000000000..ee83c4da6bc6
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
@@ -0,0 +1,33 @@
+diff -ur xfce4-panel-4.4.0.orig/plugins/actions/actions.c xfce4-panel-4.4.0/plugins/actions/actions.c
+--- xfce4-panel-4.4.0.orig/plugins/actions/actions.c	2007-01-20 18:32:58.000000000 +0200
++++ xfce4-panel-4.4.0/plugins/actions/actions.c	2007-03-11 01:28:23.000000000 +0200
+@@ -81,7 +81,7 @@
+     {
+         xfce_hvbox_set_orientation (XFCE_HVBOX (GTK_BIN (plugin)->child), 
+                 (orientation == GTK_ORIENTATION_HORIZONTAL) ?
+-                        GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
++                        GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
+     }
+ }
+ 
+@@ -127,7 +127,7 @@
+     switch (action->type)
+     {
+         case ACTION_QUIT_LOCK:
+-            width = size / 2 - 2 * border;
++            width = MIN(size - border, MAX(16, size/2 - border));
+             pb = actions_load_icon (ACTION_LOCK, width);
+             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+             g_object_unref (G_OBJECT (pb));
+@@ -241,9 +241,8 @@
+     {
+         case ACTION_QUIT_LOCK:
+             orientation = (xfce_panel_plugin_get_orientation (plugin) == 
+-                           GTK_ORIENTATION_HORIZONTAL) ?
+-                                GTK_ORIENTATION_VERTICAL : 
+-                                GTK_ORIENTATION_HORIZONTAL;
++                           GTK_ORIENTATION_VERTICAL) ?
++			   GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+ 
+             box = xfce_hvbox_new (orientation, TRUE, 0);
+             gtk_widget_show (box);
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..8543a2ced94f
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild,v 1.1 2007/03/10 23:50:25 drac Exp $
+
+inherit eutils xfce44
+
+xfce44
+
+DESCRIPTION="Panel"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc startup-notification"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	gnome-base/librsvg
+	>=x11-libs/gtk+-2.6
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	!<xfce-base/xfce-utils-4.4"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins"
+
+xfce44_core_package
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-actions.patch
+}