Merge lp:~macslow/notify-osd/exit-if-being-replaced into lp:notify-osd

[Mirco Müller]

Watch "NameLost" signal on DBus and exit if received.

* fix crucial typo
* fix a small mem-leak
* make notify-osd watch "NameLost" DBus-signal and quit, if other process takes ownership of notification-service

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-trusty-i386-ci/4

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notify-osd-ci/8/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yup, this is working!

review: Approve

[Lars Karlitski (larsu)]

Connecting gtk_main_quit() directly to the NameLost signal is a bit ugly but will definitely work.

Thanks for fixing this Mirco!

review: Approve

=== modified file 'src/dbus.c'
--- src/dbus.c	2013-10-29 18:32:15 +0000
+++ src/dbus.c	2013-10-29 18:32:15 +0000
@@ -67,7 +67,7 @@
 
 	proxy = dbus_g_proxy_new_for_name (connection,
 					   "org.freedesktop.DBus",
-					   "/org/freedesktop/Dbus",
+					   "/org/freedesktop/DBus",
 					   "org.freedesktop.DBus");
 	error = NULL;
 	if (!dbus_g_proxy_call (proxy,
@@ -83,9 +83,12 @@
 		           "Got error \"%s\"\n",
 		           error->message);
 		g_error_free (error);
+		g_object_unref (proxy);
 		return NULL;
 	}
 
+	g_object_unref (proxy);
+
 	if (request_name_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
 	{
 		g_warning ("Another instance has already registered %s", service_name);
 
=== modified file 'src/main.c'
--- src/main.c	2009-03-19 09:30:11 +0000
+++ src/main.c	2013-10-29 18:32:15 +0000
@@ -70,6 +70,18 @@
 		return 0;
 	}
 
+	DBusGProxy* proxy = dbus_g_proxy_new_for_name (connection,
+						       "org.freedesktop.DBus",
+						       "/org/freedesktop/DBus",
+						       "org.freedesktop.DBus");
+
+	dbus_g_proxy_add_signal (proxy, "NameLost", G_TYPE_STRING, G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal (proxy,
+				     "NameLost",
+				     gtk_main_quit,
+				     NULL,
+				     NULL);
+
 	dbus_g_connection_register_g_object (connection,
 					     DBUS_PATH,
 					     G_OBJECT (stack));
@@ -77,6 +89,7 @@
 	gtk_main ();
 
 	stack_del (stack);
+	g_object_unref (proxy);
 
 	return 0;
 }