re-adding a patch that's needed and removing one that is not

3 files changed, 21 insertions, 89 deletions

diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 5064569d5084..76a994e20f89 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -6,8 +6,8 @@ MD5 294bb599d9f24b1766d6de5aa6bc657f gnome-panel-2.6.0.ebuild 1692
 MD5 eaed0dc8e33c234cbc8e3040fe46f398 ChangeLog 10972
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1b4289df33228cb2b0a0a97db36e781f files/gnome-panel-2.6-parallel_install.patch 946
-MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
 MD5 fd45982a0009ea6751868529516f641a files/gnome-panel-calendar-l10n.patch 1239
+MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
 MD5 7a56d7cd6b8d36c12f13018f16a7d1a5 files/digest-gnome-panel-2.4.2 71
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
new file mode 100644
index 000000000000..3625c88b3821
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
@@ -0,0 +1,20 @@
+--- ./gnome-panel/panel-default-setup.entries~	2003-07-01 15:29:54.000000000 +0100
++++ ./gnome-panel/panel-default-setup.entries	2003-08-19 07:49:23.000000000 +0100
+@@ -98,7 +98,7 @@
+       <key>size</key>
+       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+       <value>
+-        <int>32</int>
++        <int>24</int>
+       </value>
+     </entry>
+   </entrylist>
+@@ -131,7 +131,7 @@
+       <key>size</key>
+       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+       <value>
+-        <int>32</int>
++        <int>24</int>
+       </value>
+     </entry>
+   </entrylist>
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
deleted file mode 100644
index c6edaf4d66af..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.4.0-autohide_fix.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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;