aboutsummaryrefslogtreecommitdiffstats
path: root/main/nautilus/005-gbus-assertion.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-25 18:06:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-25 19:53:02 +0000
commit286429b1aa72ee964ba0cac4b79c754859b1c60a (patch)
tree33c01e6792fd99a430be126c19b9b71947ffd060 /main/nautilus/005-gbus-assertion.patch
parent3597c695c8ae4a22da8bd26c363aa8ceae267be3 (diff)
downloadaports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.bz2
aports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.xz
main/nautilus: upgrade to 2.32.2.1
Diffstat (limited to 'main/nautilus/005-gbus-assertion.patch')
-rw-r--r--main/nautilus/005-gbus-assertion.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/main/nautilus/005-gbus-assertion.patch b/main/nautilus/005-gbus-assertion.patch
new file mode 100644
index 0000000000..44979d4311
--- /dev/null
+++ b/main/nautilus/005-gbus-assertion.patch
@@ -0,0 +1,32 @@
+From 9142d259dcaa6b011604cbd560b94ce31d314b88 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Tue, 15 Mar 2011 13:59:27 +0000
+Subject: Fix g_bus_unwatch_name assertion
+
+Commit b7262fa9 caused
+
+ GLib-GIO-CRITICAL **: g_bus_unwatch_name: assertion `watcher_id > 0' failed
+
+when starting nautilus while it's already running. Guard the
+g_bus_unwatch_name() call to only run when we actually have set a watcher to
+the screensaver.
+
+https://launchpad.net/bugs/724285
+---
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index dfeaea6..ab6ca0d 100644
+--- a/src/nautilus-application.c
++++ b/src/nautilus-application.c
+@@ -350,7 +350,9 @@ nautilus_application_finalize (GObject *object)
+
+ g_object_unref (application->unique_app);
+
+- g_bus_unwatch_name (application->ss_watch_id);
++ if (application->ss_watch_id > 0) {
++ g_bus_unwatch_name (application->ss_watch_id);
++ }
+
+ if (application->volume_queue != NULL) {
+ g_list_free_full (application->volume_queue, g_object_unref);
+--
+cgit v0.9