Merge lp:~ted/unity/upstart-panel-service into lp:unity

[Ted Gould]

Manage Unity Panel Service's lifecycle with Upstart.

Change the panel service so that instead of using dbus activation it allows upstart to manage respawning and starting the panel service. This makes it easier to test and restart the panel service as there are tools like "stop unity-panel-service" that can then have full control over the panel service lifetime.

[Ted Gould (ted)]

NOTE: This also depends on https://code.launchpad.net/~ted/unity/upstart-event/+merge/160421, but I expect that to get merged soon and LP won't let me depend on two branches.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3337
http://jenkins.qa.ubuntu.com/job/unity-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/101

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/101/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3339
http://jenkins.qa.ubuntu.com/job/unity-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/120/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

This works for Unity trunk. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2012-12-04 00:39:47 +0000
+++ UnityCore/DBusIndicators.cpp	2013-06-05 19:37:37 +0000
@@ -94,6 +94,10 @@
   gproxy_.disconnected.connect(sigc::mem_fun(this, &DBusIndicators::Impl::OnDisconnected));
 
   CheckLocalService();
+
+  if (gproxy_.IsConnected()) {
+    RequestSyncAll();
+  }
 }
 
 void DBusIndicators::Impl::CheckLocalService()
@@ -136,17 +140,6 @@
   cached_locations_.clear();
 
   CheckLocalService();
-  RequestSyncAll();
-
-  reconnect_timeout_.reset(new glib::TimeoutSeconds(1, [&] {
-    if (!gproxy_.IsConnected())
-    {
-      RequestSyncAll();
-      return true;
-    }
-
-    return false;
-  }));
 }
 
 void DBusIndicators::Impl::OnReSync(GVariant* parameters)
 
=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2011-06-23 08:40:21 +0000
+++ debian/unity-services.install	2013-06-05 19:37:37 +0000
@@ -1,3 +1,3 @@
 usr/lib/unity/*service
-usr/share/dbus-1
+usr/share/upstart
 usr/share/man/*/unity-panel-service.1
 
=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2012-12-17 11:36:26 +0000
+++ services/CMakeLists.txt	2013-06-05 19:37:37 +0000
@@ -51,5 +51,5 @@
 target_link_libraries(unity-panel-service ${LIBS})
 install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
 
-configure_file(com.canonical.Unity.Panel.Service.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.Unity.Panel.Service.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services)
+configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
 
=== removed file 'services/com.canonical.Unity.Panel.Service.service.cmake'
--- services/com.canonical.Unity.Panel.Service.service.cmake	2010-11-03 11:44:21 +0000
+++ services/com.canonical.Unity.Panel.Service.service.cmake	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.Unity.Panel.Service
-Exec=${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service
 
=== added file 'services/unity-panel-service.conf.in'
--- services/unity-panel-service.conf.in	1970-01-01 00:00:00 +0000
+++ services/unity-panel-service.conf.in	2013-06-05 19:37:37 +0000
@@ -0,0 +1,10 @@
+description "Backing Service for the Unity Panel"
+author "Ted Gould <[e-mail]>"
+
+start on started unity
+stop on stopping unity
+
+emits indicators-loaded
+
+respawn
+exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service