Update to 2.4.1.

4 files changed, 2 insertions, 270 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index f037c36d1556..fce692a48f12 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTVERSION=	2.4.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.4
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 36e659c41882..aeba29957fd9 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.4.0.tar.bz2) = 9a81f7ebbb450611a28783900f5f2cbc
+MD5 (gnome2/gnome-panel-2.4.1.tar.bz2) = bdef7c238e1d1eb7976f2bca3b0c8aca
diff --git a/x11/gnome-panel/files/patch-gnome-panel_button-widget.c b/x11/gnome-panel/files/patch-gnome-panel_button-widget.c
deleted file mode 100644
index a9a53edb8b64..000000000000
--- a/x11/gnome-panel/files/patch-gnome-panel_button-widget.c
+++ /dev/null
@@ -1,202 +0,0 @@
---- gnome-panel/button-widget.c.orig	Sat Sep 20 14:16:37 2003
-+++ gnome-panel/button-widget.c	Sat Sep 20 14:16:39 2003
-@@ -37,68 +37,6 @@
- 
- static GObjectClass *parent_class;
- 
--static void
--translate_to(GtkWidget *from, GtkWidget *to, int *x, int *y)
--{
--	while (from != to) {
--		if (!GTK_WIDGET_NO_WINDOW (from)) {
--			*x += MAX (from->allocation.x, 0);
--			*y += MAX (from->allocation.y, 0);
--		}
--		from = from->parent;
--	}
--}
--
--static void
--calculate_overlay_geometry (PanelWidget *panel,
--			    GtkWidget   *parent,
--			    GtkWidget   *applet,
--			    int         *x,
--			    int         *y,
--			    int         *w,
--			    int         *h)
--{
--	*x = applet->allocation.x;
--	*y = applet->allocation.y;
--	*w = applet->allocation.width;
--	*h = applet->allocation.height;
--
--	translate_to (GTK_WIDGET(panel), parent, x, y);
--
--	if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
--		if (applet->allocation.x > panel->size) {
--			*x = parent->requisition.width + 1;
--			*y = parent->requisition.height + 1;
--			return;
--		}
--
--		*y = 0;
--		/* we use the requisition, since allocation might have not
--		   yet happened if we are inside the allocation, anyway
--		   they are the same for basep */
--		if(*h < parent->requisition.height)
--			*h = parent->requisition.height;
--
--		if ((*w + applet->allocation.x) > panel->size) {
--			*w = panel->size - applet->allocation.x;
--		}
--	} else {
--		if (applet->allocation.y > panel->size) {
--			*x = parent->requisition.width + 1;
--			*y = parent->requisition.height + 1;
--			return;
--		}
--
--		*x = 0;
--		if(*w < parent->requisition.width)
--			*w = parent->requisition.width;
--
--		if ((*h + applet->allocation.y) > panel->size) {
--			*h = panel->size - applet->allocation.y;
--		}
--	}
--}
--
- /* colorshift a pixbuf */
- static void
- do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
-@@ -163,27 +101,19 @@
- 	GdkWindowAttr attributes;
- 	gint attributes_mask;
- 	GtkButton *button;
--	PanelWidget *panel;
--	GtkWidget *parent;
--	int x,y,w,h;
- 
- 	g_return_if_fail (widget != NULL);
- 	g_return_if_fail (BUTTON_IS_WIDGET (widget));
- 
--	panel  = PANEL_WIDGET(widget->parent);
--	parent = GTK_WIDGET (panel->toplevel);
--
--	calculate_overlay_geometry(panel, parent, widget, &x, &y, &w, &h);
--
- 	button = GTK_BUTTON (widget);
- 
- 	GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- 
- 	attributes.window_type = GDK_WINDOW_CHILD;
--	attributes.x = x;
--	attributes.y = y;
--	attributes.width = w;
--	attributes.height = h;
-+	attributes.x = widget->allocation.x;
-+	attributes.y = widget->allocation.y;
-+	attributes.width = widget->allocation.width;
-+	attributes.height = widget->allocation.height;
- 	attributes.wclass = GDK_INPUT_ONLY;
- 	attributes.event_mask = (GDK_BUTTON_PRESS_MASK |
- 				 GDK_BUTTON_RELEASE_MASK |
-@@ -194,10 +124,10 @@
- 				 GDK_LEAVE_NOTIFY_MASK);
- 	attributes_mask = GDK_WA_X | GDK_WA_Y;
- 
--	widget->window = gtk_widget_get_parent_window(widget);
-+	widget->window = gtk_widget_get_parent_window (widget);
- 	g_object_ref (G_OBJECT (widget->window));
-       
--	button->event_window = gdk_window_new (parent->window,
-+	button->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
- 					       &attributes,
- 					       attributes_mask);
- 	gdk_window_set_user_data (button->event_window, widget);
-@@ -206,24 +136,26 @@
- }
- 
- static void
--button_widget_parent_set (GtkWidget *widget,
--			  GtkWidget *previous_parent)
-+button_widget_unrealize (GtkWidget *widget)
- {
-+	GtkButton *button;
-+	PanelWidget *panel;
- 	GtkWidget *parent;
--	int        x, y, w, h;
- 
-+	g_return_if_fail (widget != NULL);
- 	g_return_if_fail (BUTTON_IS_WIDGET (widget));
- 
--	if (!GTK_WIDGET_REALIZED (widget)|| !widget->parent)
--		return;
--
--	parent = GTK_WIDGET (PANEL_WIDGET (widget->parent)->toplevel);
-+	panel = PANEL_WIDGET (widget->parent);
-+	parent = GTK_WIDGET (panel->toplevel);
-+	button = GTK_BUTTON (widget);
- 
--	calculate_overlay_geometry (
--		PANEL_WIDGET (widget->parent), parent, widget, &x, &y, &w, &h);
-+	if (button->event_window != NULL) {
-+	    	gdk_window_set_user_data (button->event_window, NULL);
-+		gdk_window_destroy (button->event_window);
-+		button->event_window = NULL;
-+	}
- 
--	gdk_window_reparent (
--		GTK_BUTTON (widget)->event_window, parent->window, x, y);
-+	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
- }
- 
- static void
-@@ -686,15 +618,15 @@
- 
- 	if (GTK_WIDGET_REALIZED (widget)) {
- 		PanelWidget *panel;
--		int          x, y, w, h;
- 
- 		panel = PANEL_WIDGET (widget->parent);
- 
--		calculate_overlay_geometry (
--			panel, GTK_WIDGET (panel->toplevel),
--			widget, &x, &y, &w, &h);
-+		gdk_window_move_resize (button->event_window,
-+					allocation->x,
-+					allocation->y,
-+					allocation->width,
-+					allocation->height);
- 
--		gdk_window_move_resize (button->event_window, x, y, w, h);
- 	}
- }
- 
-@@ -731,11 +663,15 @@
- static gboolean
- button_widget_enter_notify (GtkWidget *widget, GdkEventCrossing *event)
- {
-+    	gboolean in_button;
-+
- 	g_return_val_if_fail (BUTTON_IS_WIDGET (widget), FALSE);
- 
-+	in_button = GTK_BUTTON (widget)->in_button;
- 	GTK_WIDGET_CLASS (parent_class)->enter_notify_event (widget, event);
--	if (GTK_BUTTON (widget)->in_button)
--		gtk_widget_queue_draw (widget);
-+	if (in_button != GTK_BUTTON (widget)->in_button &&
-+		panel_global_config_get_highlight_when_over ())
-+	    		gtk_widget_queue_draw (widget);
- 
- 	return FALSE;
- }
-@@ -818,7 +754,7 @@
- 	gobject_class->set_property = button_widget_set_property;
- 	  
- 	widget_class->realize            = button_widget_realize;
--	widget_class->parent_set         = button_widget_parent_set;
-+	widget_class->unrealize          = button_widget_unrealize;
- 	widget_class->size_allocate      = button_widget_size_allocate;
- 	widget_class->size_request       = button_widget_size_request;
- 	widget_class->button_press_event = button_widget_button_press;
diff --git a/x11/gnome-panel/files/patch-po_zh_CN.po b/x11/gnome-panel/files/patch-po_zh_CN.po
deleted file mode 100644
index 5c68615e7e8c..000000000000
--- a/x11/gnome-panel/files/patch-po_zh_CN.po
+++ /dev/null
@@ -1,65 +0,0 @@
---- po/zh_CN.po.orig	Wed Oct  1 15:56:29 2003
-+++ po/zh_CN.po	Wed Oct  1 15:57:06 2003
-@@ -24,27 +24,27 @@
- # applets/gen_util/clock.c:157
- #: applets/clock/clock.c:219
- msgid "%l:%M:%S %p"
--msgstr "%-H:%M:%S"
-+msgstr "%H:%M:%S"
- 
- # applets/gen_util/clock.c:157
- #: applets/clock/clock.c:219
- msgid "%l:%M %p"
--msgstr "%-H:%M"
-+msgstr "-H:%M"
- 
- # applets/mini-commander/src/message.c:105
- #: applets/clock/clock.c:221 applets/clock/clock.c:773
- msgid "%H:%M:%S"
--msgstr "%-H:%M:%S"
-+msgstr "%H:%M:%S"
- 
- # applets/mini-commander/src/message.c:105
- #: applets/clock/clock.c:221 applets/clock/clock.c:775
- msgid "%H:%M"
--msgstr "%-H:%M"
-+msgstr "%H:%M"
- 
- # applets/gen_util/clock.c:131
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%-m月%-d日%A"
-+msgstr "%m月%d日%A"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -72,7 +72,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%-m月%-d日%A"
-+msgstr "%m月%d日%A"
- 
- # panel/panel_config.c:705
- #: applets/clock/clock.c:472
-@@ -86,17 +86,17 @@
- # applets/gen_util/clock.c:157
- #: applets/clock/clock.c:768
- msgid "%I:%M:%S %p"
--msgstr "%p %-I:%M:%S"
-+msgstr "%p %I:%M:%S"
- 
- # applets/gen_util/clock.c:157
- #: applets/clock/clock.c:770
- msgid "%I:%M %p"
--msgstr "%p %-I:%M "
-+msgstr "%p %I:%M "
- 
- # applets/clockmail/clockmail.c:133
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%Y年%-m月%-d日%A"
-+msgstr "%Y年%m月%d日%A"
- 
- #: applets/clock/clock.c:850
- #, c-format