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

Proposed by Charles Kerr on 2013-10-08
Status: Merged
Approved by: Ted Gould on 2013-10-08
Approved revision: 52
Merged at revision: 51
Proposed branch: lp:~charlesk/indicator-location/lp-1234975
Merge into: lp:indicator-location/13.10
Diff against target: 26 lines (+3/-2)
2 files modified
src/phone.cc (+2/-1)
tests/phone-test.cc (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-location/lp-1234975
Reviewer Review Type Date Requested Status
Ted Gould (community) 2013-10-08 Approve on 2013-10-08
PS Jenkins bot (community) continuous-integration Approve on 2013-10-08
Review via email: mp+189937@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/phone.cc'
2--- src/phone.cc 2013-10-03 20:58:09 +0000
3+++ src/phone.cc 2013-10-08 18:20:14 +0000
4@@ -251,7 +251,8 @@
5 submenu = g_menu_new ();
6 g_menu_append (submenu, _("Location detection"), "indicator." LOCATION_ACTION_KEY);
7 g_menu_append (submenu, _("GPS"), "indicator." GPS_ACTION_KEY);
8- g_menu_append (submenu, _("Location settingsā€¦"), "indicator." SETTINGS_ACTION_KEY "::location");
9+ // disabled for 13.04 -- the location settings panel isn't complete
10+ // g_menu_append (submenu, _("Location settingsā€¦"), "indicator." SETTINGS_ACTION_KEY "::location");
11
12 /* add the submenu to a new header */
13 header = g_menu_item_new (nullptr, "indicator." HEADER_ACTION_KEY);
14
15=== modified file 'tests/phone-test.cc'
16--- tests/phone-test.cc 2013-08-25 21:44:50 +0000
17+++ tests/phone-test.cc 2013-10-08 18:20:14 +0000
18@@ -96,7 +96,7 @@
19 {
20 ASSERT_TRUE (action_menuitem_exists ("indicator.location-detection-enabled"));
21 ASSERT_TRUE (action_menuitem_exists ("indicator.gps-detection-enabled"));
22- ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
23+ //ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
24 }
25
26 TEST_F (PhoneTest, PlatformTogglesGPS)

Subscribers

People subscribed via source and target branches