Merge lp:~larsu/indicator-printers/lp1304434 into lp:indicator-printers/14.04

[Lars Karlitski]

service: own bus name so that the panel can find it on the bus

service: own bus name so that the panel can find it on the bus

This got accidentally removed in r68.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/indicator-printers-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-printers-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-printers-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-printers-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-printers-ci/3/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Confirmed, this fix reinstates com.canonical.indicator.printers to the session bus.

Thanks Lars!

review: Approve

=== modified file 'src/indicator-printers-service.c'
--- src/indicator-printers-service.c	2014-03-13 17:30:04 +0000
+++ src/indicator-printers-service.c	2014-05-15 11:25:24 +0000
@@ -132,6 +132,17 @@
     ippDelete (resp);
 }
 
+static void
+name_lost (GDBusConnection *connection,
+           const gchar     *name,
+           gpointer         user_data)
+{
+    int subscription_id = GPOINTER_TO_INT (user_data);
+
+    cancel_subscription (subscription_id);
+    gtk_main_quit ();
+}
+
 int main (int argc, char *argv[])
 {
     /* Init i18n */
@@ -154,6 +165,12 @@
                            renew_subscription_timeout,
                            &subscription_id);
 
+    g_bus_own_name (G_BUS_TYPE_SESSION,
+                    INDICATOR_PRINTERS_DBUS_NAME,
+                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                    NULL, NULL, name_lost,
+                    GINT_TO_POINTER (subscription_id), NULL);
+
     cups_notifier = cups_notifier_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                           0,
                                                           NULL,