Merge lp:~ted/indicator-location/upstart-job into lp:indicator-location/13.10

[Ted Gould]

Covert to upstart job

No description needed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-location/upstart-job]

44. By Ted Gould on 2013-10-29

Grab trunk

45. By Ted Gould on 2013-10-29

XDG Autostart File

Unmerged revisions

45. By Ted Gould on 2013-10-29

XDG Autostart File

44. By Ted Gould on 2013-10-29

Grab trunk

43. By Ted Gould on 2013-08-27

Some fixes

42. By Ted Gould on 2013-08-27

Adding in an upstart job

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-08-26 20:34:44 +0000
+++ data/CMakeLists.txt	2013-10-29 16:42:11 +0000
@@ -1,22 +1,42 @@
 ##
-##  DBus Service File
-##
-
-# where to install
-set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
-message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
-
-set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
-set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
-set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
-
-# build it
-set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
-configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
-
-# install it
-install (FILES "${SERVICE_FILE}"
-         DESTINATION "${DBUS_SERVICE_DIR}")
+##  Upstart Job File
+##
+
+# where to install
+set (UPSTART_JOBS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
+message (STATUS "${UPSTART_JOBS_DIR} is the Upstart Jobs File install dir")
+
+set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
+set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
+set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
+
+# install it
+install (FILES "${UPSTART_JOB_FILE}"
+         DESTINATION "${UPSTART_JOBS_DIR}")
+
+##
+##  XDG Autostart File
+##
+
+# where to install
+set (XDG_AUTOSTART_DIR "/etc/xdg/autostart")
+message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir")
+
+set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop")
+set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}")
+set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
+
+# install it
+install (FILES "${XDG_AUTOSTART_FILE}"
+         DESTINATION "${XDG_AUTOSTART_DIR}")
 
 ##
 ##  Unity Indicator File

=== modified file 'data/com.canonical.indicator.location'
--- data/com.canonical.indicator.location	2013-09-16 13:34:29 +0000
+++ data/com.canonical.indicator.location	2013-10-29 16:42:11 +0000
@@ -6,3 +6,6 @@
 [phone]
 ObjectPath=/com/canonical/indicator/location/phone
 
+[phone_greeter]
+ObjectPath=/com/canonical/indicator/location/phone
+

=== added file 'data/indicator-location.conf.in'
--- data/indicator-location.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-location.conf.in	2013-10-29 16:42:11 +0000
@@ -0,0 +1,8 @@
+description "Indicator Location Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-location-service

=== added file 'data/indicator-location.desktop.in'
--- data/indicator-location.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-location.desktop.in	2013-10-29 16:42:11 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Location
+Exec=@pkglibexecdir@/indicator-location-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-location.service.in'
--- data/indicator-location.service.in	2013-08-11 16:43:06 +0000
+++ data/indicator-location.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.location
-Exec=@pkglibexecdir@/indicator-location-service

=== modified file 'src/phone.cc'
--- src/phone.cc	2013-10-08 18:05:58 +0000
+++ src/phone.cc	2013-10-29 16:42:11 +0000
@@ -246,11 +246,22 @@
   GMenu * menu;
   GMenu * submenu;
   GMenuItem * header;
+  GMenuItem * location;
+  GMenuItem * gps;
 
   /* create the submenu */
   submenu = g_menu_new ();
-  g_menu_append (submenu, _("Location detection"), "indicator." LOCATION_ACTION_KEY);
-  g_menu_append (submenu, _("GPS"), "indicator." GPS_ACTION_KEY);
+
+  location = g_menu_item_new (_("Location detection"), "indicator." LOCATION_ACTION_KEY);
+  g_menu_item_set_attribute (location, "x-canonical-type", "s", "com.canonical.indicator.switch");
+  g_menu_append_item (submenu, location);
+  g_object_unref (location);
+
+  gps = g_menu_item_new (_("GPS"), "indicator." GPS_ACTION_KEY);
+  g_menu_item_set_attribute (gps, "x-canonical-type", "s", "com.canonical.indicator.switch");
+  g_menu_append_item (submenu, gps);
+  g_object_unref (gps);
+
   // disabled for 13.04 -- the location settings panel isn't complete
   // g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");