diff options
| author | marcus <marcus@FreeBSD.org> | 2003-08-02 12:48:57 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-08-02 12:48:57 +0800 |
| commit | c469015574c403d9f19e20e5ad8c0ae6dc306575 (patch) | |
| tree | 7077f40a86d48a56a31b35b0a736b64110d6dd43 /x11 | |
| parent | 5f44f4a0f2d96525beeabed5f4826a743d3bc455 (diff) | |
| download | freebsd-ports-gnome-c469015574c403d9f19e20e5ad8c0ae6dc306575.tar.gz freebsd-ports-gnome-c469015574c403d9f19e20e5ad8c0ae6dc306575.tar.zst freebsd-ports-gnome-c469015574c403d9f19e20e5ad8c0ae6dc306575.zip | |
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
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-panel/Makefile | 1 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-gnome-panel_panel.c | 25 | ||||
| -rw-r--r-- | x11/gnomepanel/Makefile | 1 | ||||
| -rw-r--r-- | x11/gnomepanel/files/patch-gnome-panel_panel.c | 25 |
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 |