Merge lp:~charlesk/indicator-location/lp-1234975 into lp:indicator-location/13.10

[Charles Kerr]

Since the "Location Settings" panel is disabled in system-settings for 13.10, hide the indicator's menuitem that activates that panel.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-location-ci/22/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/phone.cc'
--- src/phone.cc	2013-10-03 20:58:09 +0000
+++ src/phone.cc	2013-10-08 18:20:14 +0000
@@ -251,7 +251,8 @@
   submenu = g_menu_new ();
   g_menu_append (submenu, _("Location detection"), "indicator." LOCATION_ACTION_KEY);
   g_menu_append (submenu, _("GPS"), "indicator." GPS_ACTION_KEY);
-  g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
+  // disabled for 13.04 -- the location settings panel isn't complete
+  // g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
 
   /* add the submenu to a new header */
   header = g_menu_item_new (nullptr, "indicator." HEADER_ACTION_KEY);
 
=== modified file 'tests/phone-test.cc'
--- tests/phone-test.cc	2013-08-25 21:44:50 +0000
+++ tests/phone-test.cc	2013-10-08 18:20:14 +0000
@@ -96,7 +96,7 @@
 {
   ASSERT_TRUE (action_menuitem_exists ("indicator.location-detection-enabled"));
   ASSERT_TRUE (action_menuitem_exists ("indicator.gps-detection-enabled"));
-  ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
+  //ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
 }
 
 TEST_F (PhoneTest, PlatformTogglesGPS)