summaryrefslogtreecommitdiffstats
path: root/x11/gnome-panel
diff options
context:
space:
mode:
authorjylefort <jylefort@df743ca5-7f9a-e211-a948-0013205c9059>2005-06-11 09:10:14 +0800
committerjylefort <jylefort@df743ca5-7f9a-e211-a948-0013205c9059>2005-06-11 09:10:14 +0800
commitd80a5886c3407a8867a7f800f75f027fa6ade69a (patch)
treee73490a89982d993048b8a74d9ac2aedb5d9607c /x11/gnome-panel
parent8af979954340cd37ff6ac492a80004bf6290cac4 (diff)
downloadmarcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar.gz
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar.bz2
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar.lz
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar.xz
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.tar.zst
marcuscom-ports-d80a5886c3407a8867a7f800f75f027fa6ade69a.zip
Load menu icons even if they are installed after their .desktop file
http://bugzilla.gnome.org/show_bug.cgi?id=306359 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4071 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel')
-rw-r--r--x11/gnome-panel/Makefile1
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_menu.c42
2 files changed, 43 insertions, 0 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 55533d0ff..21f9a6797 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomepanel
PORTVERSION= 2.11.3
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.11
diff --git a/x11/gnome-panel/files/patch-gnome-panel_menu.c b/x11/gnome-panel/files/patch-gnome-panel_menu.c
new file mode 100644
index 000000000..aa7aeae8c
--- /dev/null
+++ b/x11/gnome-panel/files/patch-gnome-panel_menu.c
@@ -0,0 +1,42 @@
+--- gnome-panel/menu.c.orig Sat Mar 26 15:12:10 2005
++++ gnome-panel/menu.c Fri Jun 3 11:17:45 2005
+@@ -1535,8 +1535,8 @@
+ return NULL;
+ }
+
+-static void
+-image_menu_shown (GtkWidget *image, gpointer data)
++static gboolean
++image_menu_exposed (GtkWidget *image, GdkEventExpose *event, gpointer data)
+ {
+ IconToLoad *new_icon;
+ IconToLoad *icon;
+@@ -1545,7 +1545,7 @@
+
+ /* if we've already handled this */
+ if (gtk_image_get_storage_type (GTK_IMAGE (image)) != GTK_IMAGE_EMPTY)
+- return;
++ return FALSE; /* propagate event */
+
+ if (find_in_load_list (image) == NULL) {
+ new_icon = icon_to_load_copy (icon);
+@@ -1554,6 +1554,8 @@
+ }
+ if (load_icons_id == 0)
+ load_icons_id = g_idle_add (load_icons_handler, NULL);
++
++ return FALSE; /* propagate event */
+ }
+
+ static void
+@@ -1601,8 +1603,8 @@
+ gtk_image_menu_item_set_image (
+ GTK_IMAGE_MENU_ITEM (image_menu_item), image);
+
+- g_signal_connect_data (image, "map",
+- G_CALLBACK (image_menu_shown), icon,
++ g_signal_connect_data (image, "expose-event",
++ G_CALLBACK (image_menu_exposed), icon,
+ (GClosureNotify) icon_to_load_free, 0);
+
+ g_signal_connect (image, "destroy",