summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-08-02 04:48:57 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-08-02 04:48:57 +0000
commit03a5b92abbe1d4a7fdf308cf125de6174623ae0d (patch)
treebf6323efaa3588fbeb23058eaf7af021edc13da2 /x11
parentFix a typo. (diff)
Fix a bus error on logout on -CURRENT if one of the panels contained
a drawer. This patch has been fed back to GNOME via Bugzilla. More details can be found here: http://bugzilla.gnome.org/show_bug.cgi?id=96423
Notes
Notes: svn path=/head/; revision=86175
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-panel/Makefile1
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_panel.c25
-rw-r--r--x11/gnomepanel/Makefile1
-rw-r--r--x11/gnomepanel/files/patch-gnome-panel_panel.c25
4 files changed, 52 insertions, 0 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 3ae2260abe5e..caa6e7f78e31 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomepanel
PORTVERSION= 2.2.2.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.2
diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel.c b/x11/gnome-panel/files/patch-gnome-panel_panel.c
new file mode 100644
index 000000000000..4c51bc47f38c
--- /dev/null
+++ b/x11/gnome-panel/files/patch-gnome-panel_panel.c
@@ -0,0 +1,25 @@
+--- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003
++++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003
+@@ -569,18 +569,18 @@
+
+ if (pd->menu)
+ g_object_unref (pd->menu);
+- pd->menu = NULL;
+-
+- pd->panel = NULL;
+
+ if (pd->deactivate_idle != 0)
+ g_source_remove (pd->deactivate_idle);
+- pd->deactivate_idle = 0;
+
+ g_object_set_data (G_OBJECT (widget), "PanelData", NULL);
+
+ panel_list = g_slist_remove (panel_list, pd);
+ g_free (pd);
++
++ pd->menu = NULL;
++ pd->panel = NULL;
++ pd->deactivate_idle = 0;
+ }
+
+ static void
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 3ae2260abe5e..caa6e7f78e31 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomepanel
PORTVERSION= 2.2.2.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/2.2
diff --git a/x11/gnomepanel/files/patch-gnome-panel_panel.c b/x11/gnomepanel/files/patch-gnome-panel_panel.c
new file mode 100644
index 000000000000..4c51bc47f38c
--- /dev/null
+++ b/x11/gnomepanel/files/patch-gnome-panel_panel.c
@@ -0,0 +1,25 @@
+--- gnome-panel/panel.c.orig Fri Aug 1 21:48:35 2003
++++ gnome-panel/panel.c Fri Aug 1 21:48:37 2003
+@@ -569,18 +569,18 @@
+
+ if (pd->menu)
+ g_object_unref (pd->menu);
+- pd->menu = NULL;
+-
+- pd->panel = NULL;
+
+ if (pd->deactivate_idle != 0)
+ g_source_remove (pd->deactivate_idle);
+- pd->deactivate_idle = 0;
+
+ g_object_set_data (G_OBJECT (widget), "PanelData", NULL);
+
+ panel_list = g_slist_remove (panel_list, pd);
+ g_free (pd);
++
++ pd->menu = NULL;
++ pd->panel = NULL;
++ pd->deactivate_idle = 0;
+ }
+
+ static void