Two new patches, fixing bug #31309

5 files changed, 131 insertions, 13 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 9d099fb82667..09e751326e75 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,7 +1,13 @@
 # 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.59 2003/10/22 12:01:39 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.60 2003/10/30 11:30:36 leonardop Exp $
 
+  30 Oct 2003; L. Boshell <leonardop@gentoo.org> gnome-panel-2.4.0-r2.ebuild,
+  files/gnome-panel-2.4.0-autohide_fix.patch,
+  files/gnome-panel-2.4.0-drawers_expanding_fix.patch:
+  A couple of additional patches from Gnome's CVS to fix more drawers
+  problems. Fixes bug #31309.
+  
   22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org>
   gnome-panel-2.4.0-r1.ebuild:
   set ppc in keywords
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 823387b420cf..6be0f519a772 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,23 +1,25 @@
-MD5 25ad62845a9e511761ae079713752540 ChangeLog 7907
+MD5 3b447f22e8de601e7df40e4db34fd858 ChangeLog 8187
 MD5 1c41d01742b08320a5080625b7862d11 gnome-panel-1.4.1.ebuild 1774
-MD5 48542b12f7de0aa1d685b144b762a3ff gnome-panel-1.4.2-r2.ebuild 2016
-MD5 623e3c1deaace4f7ecea86edb2de8e71 gnome-panel-2.0.9.ebuild 1264
 MD5 1272743bcce046b4520549f4e2c297f3 gnome-panel-2.2.1.ebuild 967
 MD5 95daeb28a4a553527a9b88656a058732 gnome-panel-2.2.2.ebuild 975
-MD5 eb58dda325007520bcfc41d8f435dd60 gnome-panel-2.2.2.2.ebuild 960
+MD5 5de595bbd96413c3f35afd8f7c72a777 gnome-panel-2.4.0-r2.ebuild 1874
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 110d7baa6d45676d75e42fb41df97191 gnome-panel-2.4.0-r1.ebuild 1621
-MD5 7da12822e170a97157a3fecf0b1394b4 gnome-panel-2.4.0-r2.ebuild 1712
+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 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
-MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
-MD5 0a052b9077e11ce4e7817086d8f16d8e files/digest-gnome-panel-2.0.9 71
 MD5 aa9fbd835415fb98e0ccf04c782fe80f files/digest-gnome-panel-2.2.1 71
 MD5 2e605d3f26decbbd5ce0ae57ebef6611 files/digest-gnome-panel-2.2.2 71
+MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r2 71
 MD5 4e1b795f852d1e379d50f668ea0e8a1e files/digest-gnome-panel-2.2.2.2 73
-MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
 MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
+MD5 0a052b9077e11ce4e7817086d8f16d8e files/digest-gnome-panel-2.0.9 71
+MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
 MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
-MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r2 71
-MD5 756269f1a3d35355c5fd61009b9f4831 files/digest-gnome-panel-2.4.1 71
 MD5 1bb4e04fb5577b5f7ffee6c5ef2855b2 files/gnome-panel-2.4.0-drawers_fix.patch 6205
+MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
+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
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-autohide_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-autohide_fix.patch
new file mode 100644
index 000000000000..c6edaf4d66af
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-autohide_fix.patch
@@ -0,0 +1,88 @@
+diff -NurB gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c gnome-panel-2.4.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c	2003-10-16 21:03:59.000000000 -0500
++++ gnome-panel-2.4.0/gnome-panel/panel-toplevel.c	2003-10-16 23:51:44.000000000 -0500
+@@ -133,6 +133,7 @@
+ 	gulong                  attach_toplevel_signals [N_ATTACH_TOPLEVEL_SIGNALS];
+ 	GtkWidget              *attach_widget;
+ 	gulong                  attach_widget_signals [N_ATTACH_WIDGET_SIGNALS];
++	gint                    n_autohide_disablers;
+ 
+ 	guint                   auto_hide : 1;
+ 	guint                   animate : 1;
+@@ -1007,6 +1008,29 @@
+ 			(x > SNAP_TOLERANCE) && (x < (screen_width - toplevel->priv->geometry.width - SNAP_TOLERANCE));
+ }
+ 
++static void
++panel_toplevel_push_autohide_disabler (PanelToplevel *toplevel)
++{
++	g_return_if_fail (toplevel != NULL);
++
++	toplevel->priv->n_autohide_disablers++;
++}
++
++static void
++panel_toplevel_pop_autohide_disabler (PanelToplevel *toplevel)
++{
++	g_return_if_fail (toplevel != NULL);
++	g_return_if_fail (toplevel->priv->n_autohide_disablers > 0);
++
++	toplevel->priv->n_autohide_disablers--;
++}
++
++static gboolean
++panel_toplevel_get_autohide_disabled (PanelToplevel *toplevel)
++{
++	return toplevel->priv->n_autohide_disablers > 0 ? TRUE : FALSE;
++}
++
+ static gboolean
+ panel_toplevel_hide_button_event (PanelToplevel  *toplevel,
+ 				  GdkEventButton *event,
+@@ -2352,6 +2376,8 @@
+ 	if (!toplevel->priv->attached)
+ 		return;
+ 
++	panel_toplevel_pop_autohide_disabler (toplevel->priv->attach_toplevel);
++
+ 	panel_toplevel_disconnect_attached (toplevel);
+ 	
+ 	panel_toplevel_reverse_arrows (toplevel);
+@@ -3026,6 +3052,9 @@
+ 
+ 	g_signal_emit (toplevel, toplevel_signals [HIDE_SIGNAL], 0);
+ 
++	if (toplevel->priv->attach_toplevel)
++		panel_toplevel_pop_autohide_disabler (toplevel->priv->attach_toplevel);
++
+ 	if (auto_hide)
+ 		toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
+ 	else {
+@@ -3102,6 +3131,9 @@
+ 
+ 	panel_toplevel_update_hide_buttons (toplevel);
+ 
++	if (toplevel->priv->attach_toplevel)
++		panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
++
+ 	if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+ 		panel_toplevel_start_animation (toplevel);
+ 	else
+@@ -3157,7 +3189,8 @@
+ 	if ( ! toplevel->priv->auto_hide ||
+ 	    toplevel->priv->hide_timeout ||
+ 	    toplevel->priv->state != PANEL_STATE_NORMAL ||
+-	    panel_toplevel_contains_pointer (toplevel))
++	    panel_toplevel_contains_pointer (toplevel) ||
++	    panel_toplevel_get_autohide_disabled (toplevel))
+ 		return;
+ 
+ 	if (toplevel->priv->unhide_timeout)
+@@ -3946,6 +3979,7 @@
+ 
+ 	toplevel->priv->attach_toplevel = NULL;
+ 	toplevel->priv->attach_widget   = NULL;
++	toplevel->priv->n_autohide_disablers = 0;
+ 
+ 	for (i = 0; i < N_ATTACH_TOPLEVEL_SIGNALS; i++)
+ 		toplevel->priv->attach_toplevel_signals [i] = 0;
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch
new file mode 100644
index 000000000000..57109591a601
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.4.0-drawers_expanding_fix.patch
@@ -0,0 +1,17 @@
+diff -NurB gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c gnome-panel-2.4.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.4.0-orig/gnome-panel/panel-toplevel.c	2003-10-16 21:03:59.000000000 -0500
++++ gnome-panel-2.4.0/gnome-panel/panel-toplevel.c	2003-10-30 05:43:01.000000000 -0500
+@@ -2187,9 +2187,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.0-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
index 063b8b80fb3c..68ae71ba5fad 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.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.0-r2.ebuild,v 1.2 2003/10/21 02:58:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild,v 1.3 2003/10/30 11:30:36 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -48,6 +48,11 @@ src_unpack() {
 	# Fix for drawers problems. (Bug #30809)
 	epatch ${FILESDIR}/${PN}-${PV}-drawers_fix.patch
 
+	# Fixes for more drawers problem. (Bug #31309)
+	epatch ${FILESDIR}/${PN}-${PV}-autohide_fix.patch
+	epatch ${FILESDIR}/${PN}-${PV}-drawers_expanding_fix.patch
+
+
 	sed -i 's:--load:-v:' gnome-panel/Makefile.am
 
 	WANT_AUTOMAKE=1.4 automake || die