Patch for drawers problem in gnome-panel-2.4.1

4 files changed, 29 insertions, 4 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 09e751326e75..db025ba6fd6b 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.60 2003/10/30 11:30:36 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.61 2003/10/31 14:57:34 leonardop Exp $
+
+  31 Oct 2003; L. Boshell <leonardop@gentoo.org> gnome-panel-2.4.1.ebuild,
+  files/gnome-panel-2.4.1-drawers_expanding_fix.patch:
+  Patch to fix drawers problem, this time in 2.4.1.
 
   30 Oct 2003; L. Boshell <leonardop@gentoo.org> gnome-panel-2.4.0-r2.ebuild,
   files/gnome-panel-2.4.0-autohide_fix.patch,
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 6be0f519a772..04bd9d21791e 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,4 +1,4 @@
-MD5 3b447f22e8de601e7df40e4db34fd858 ChangeLog 8187
+MD5 6768d3b2a19ce81e8e68baecee3f4384 ChangeLog 8370
 MD5 1c41d01742b08320a5080625b7862d11 gnome-panel-1.4.1.ebuild 1774
 MD5 1272743bcce046b4520549f4e2c297f3 gnome-panel-2.2.1.ebuild 967
 MD5 95daeb28a4a553527a9b88656a058732 gnome-panel-2.2.2.ebuild 975
@@ -6,7 +6,7 @@ MD5 5de595bbd96413c3f35afd8f7c72a777 gnome-panel-2.4.0-r2.ebuild 1874
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 623e3c1deaace4f7ecea86edb2de8e71 gnome-panel-2.0.9.ebuild 1264
 MD5 eb58dda325007520bcfc41d8f435dd60 gnome-panel-2.2.2.2.ebuild 960
-MD5 596ccca340559130591243988c6bbb4d gnome-panel-2.4.1.ebuild 1632
+MD5 f19b1a41588be31e1560c5546fbc1494 gnome-panel-2.4.1.ebuild 1752
 MD5 48542b12f7de0aa1d685b144b762a3ff gnome-panel-1.4.2-r2.ebuild 2016
 MD5 110d7baa6d45676d75e42fb41df97191 gnome-panel-2.4.0-r1.ebuild 1621
 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
@@ -23,3 +23,4 @@ MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
 MD5 756269f1a3d35355c5fd61009b9f4831 files/digest-gnome-panel-2.4.1 71
 MD5 08d08fb07508d922ef40625fd41d53d6 files/gnome-panel-2.4.0-drawers_expanding_fix.patch 639
+MD5 9696dc7286c62ec7105c7d927be6b4dc files/gnome-panel-2.4.1-drawers_expanding_fix.patch 639
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch
new file mode 100644
index 000000000000..27571b53ef8c
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.4.1-drawers_expanding_fix.patch
@@ -0,0 +1,17 @@
+diff -NurB gnome-panel-2.4.1-orig/gnome-panel/panel-toplevel.c gnome-panel-2.4.1/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.4.1-orig/gnome-panel/panel-toplevel.c	2003-10-31 09:24:02.000000000 -0500
++++ gnome-panel-2.4.1/gnome-panel/panel-toplevel.c	2003-10-31 09:25:41.000000000 -0500
+@@ -2212,9 +2212,10 @@
+ static void
+ panel_toplevel_attach_toplevel_hiding (PanelToplevel *toplevel)
+ {
+-	panel_toplevel_hide (toplevel, FALSE, -1);
+-
+-	toplevel->priv->attach_hidden = TRUE;
++	if (!panel_toplevel_get_is_hidden (toplevel)) {
++		panel_toplevel_hide (toplevel, FALSE, -1);
++		toplevel->priv->attach_hidden = TRUE;
++	}
+ }
+ 
+ static void
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
index e2577d51619a..515dc1e7df7a 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild,v 1.1 2003/10/20 16:25:16 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild,v 1.2 2003/10/31 14:57:34 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -45,6 +45,9 @@ src_unpack() {
 	# fix initial menu size
 	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch
 
+	# fix bad behavior of drawers on `autohide' panels.
+	epatch ${FILESDIR}/${PN}-2.4.1-drawers_expanding_fix.patch
+
 	sed -i 's:--load:-v:' gnome-panel/Makefile.am
 
 	WANT_AUTOMAKE=1.4 automake || die