summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-extra/bug-buddy/ChangeLog6
-rw-r--r--gnome-extra/bug-buddy/files/bug-buddy-2.32.0-gnomesession-debug.patch27
2 files changed, 32 insertions, 1 deletions
diff --git a/gnome-extra/bug-buddy/ChangeLog b/gnome-extra/bug-buddy/ChangeLog
index c474525892a3..ec2a36da749e 100644
--- a/gnome-extra/bug-buddy/ChangeLog
+++ b/gnome-extra/bug-buddy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/bug-buddy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/bug-buddy/ChangeLog,v 1.187 2010/12/16 19:36:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/bug-buddy/ChangeLog,v 1.188 2010/12/17 08:38:34 pacho Exp $
+
+ 17 Dec 2010; Pacho Ramos <pacho@gentoo.org>
+ +files/bug-buddy-2.32.0-gnomesession-debug.patch:
+ Add missing patch (thanks to jeremy for noticing).
*bug-buddy-2.32.0-r1 (16 Dec 2010)
diff --git a/gnome-extra/bug-buddy/files/bug-buddy-2.32.0-gnomesession-debug.patch b/gnome-extra/bug-buddy/files/bug-buddy-2.32.0-gnomesession-debug.patch
new file mode 100644
index 000000000000..18d5de40f935
--- /dev/null
+++ b/gnome-extra/bug-buddy/files/bug-buddy-2.32.0-gnomesession-debug.patch
@@ -0,0 +1,27 @@
+From 475fa5697d0aad6883318e9c51af81f51c9030e4 Mon Sep 17 00:00:00 2001
+From: Fernando Herrera <fherrera@onirica.com>
+Date: Tue, 22 Jun 2010 20:18:23 +0000
+Subject: Do not call old log_handler if it is not glib's default
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=622068
+---
+diff --git a/segv_handler/gnome-segvhanlder.c b/segv_handler/gnome-segvhanlder.c
+index de64df5..ae3196e 100644
+--- a/segv_handler/gnome-segvhanlder.c
++++ b/segv_handler/gnome-segvhanlder.c
+@@ -284,6 +284,13 @@ gtk_module_init (int *argc, char** argv[])
+ sigaction(SIGBUS, setptr, NULL);
+
+ old_handler = g_log_set_default_handler (bug_buddy_log_handler, NULL);
++
++ /* We cannot call previous log handlers other than glib's default
++ * because we don't know its previous user_data and they may rely on it
++ * See https://bugzilla.gnome.org/show_bug.cgi?id=622068 */
++ if (old_handler != g_log_default_handler) {
++ old_handler = NULL;
++ }
+ }
+ return 0;
+ }
+--
+cgit v0.8.3.1