summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2012-09-27 08:19:15 +0300
committerPriit Laes <plaes@plaes.org>2012-09-27 08:19:15 +0300
commit1b245a6d28cd224f17af04eee99b1249555ff621 (patch)
treed7e1d847247a8d51b97d64586943e89bbd7f60a8 /gnome-base/gnome-settings-daemon/files
parentx11-libs/gtk+, x11-themes/gnome-themes-standard, at-spi2-*: now in gx86 (diff)
downloadgnome-1b245a6d28cd224f17af04eee99b1249555ff621.tar.gz
gnome-1b245a6d28cd224f17af04eee99b1249555ff621.tar.bz2
gnome-1b245a6d28cd224f17af04eee99b1249555ff621.zip
gnome-base/gnome-settings-daemon: 3.5.92 → 3.6.0
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
new file mode 100644
index 00000000..3980fbd8
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
@@ -0,0 +1,29 @@
+From dcfe290500e0d68a71f09e576e28c09f7572cef6 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 21 Sep 2012 11:46:34 +0000
+Subject: housekeeping: Don't crash on exit
+
+If a notification popup was shown, and then dismissed, notification
+wouldn't have been reset, and we would crash on exit trying to
+dismiss it.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=859383
+https://bugzilla.gnome.org/show_bug.cgi?id=684548
+
+Also includes 63b8c025d446b1a8d7c5fdee92d624dd604f3a24 (typo fix)
+
+---
+diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
+index 4c6b3c5..51e4a8e 100644
+--- a/plugins/housekeeping/gsd-disk-space.c
++++ b/plugins/housekeeping/gsd-disk-space.c
+@@ -294,6 +294,7 @@ static void
+ on_notification_closed (NotifyNotification *notification)
+ {
+ g_object_unref (notification);
++ notification = NULL;
+ }
+
+ static gboolean
+--
+cgit v0.9.0.2