Indicator Location

Merge lp:~charlesk/indicator-location/lp-1533835-use-correct-url-for-system-settings into lp:indicator-location/16.04

  1. lp-1533835-use-correct-url-for-system-settings
  2. Merge into trunk.16.04
Proposed by Charles Kerr
Status: Merged
Approved by: Xavi Garcia
Approved revision: 171
Merged at revision: 154
Proposed branch: lp:~charlesk/indicator-location/lp-1533835-use-correct-url-for-system-settings
Merge into: lp:indicator-location/16.04
Prerequisite: lp:~charlesk/indicator-location/style
Diff against target: 20 lines (+3/-2)
1 file modified
src/phone.cc (+3/-2)
To merge this branch: bzr merge lp:~charlesk/indicator-location/lp-1533835-use-correct-url-for-system-settings
Reviewer Review Type Date Requested Status
Xavi Garcia Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+284964@code.launchpad.net

Commit message

When 'Location settings…' is clicked, invoke the uri 'settings:///location'

Description of the change

When 'Location settings…' is clicked, invoke the uri 'settings:///location'

As requested in <https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1533835/comments/4> by jgdx who is handling the systems-settings component of this bug.

This new URI won't do anything until there's a systems-settings branch to handle it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/10/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Looks good to me, thanks

review: Approve

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 2016-02-03 19:54:44 +0000
3+++ src/phone.cc 2016-02-03 19:54:44 +0000
4@@ -227,7 +227,8 @@
5 void on_settings_activated(GSimpleAction* simple G_GNUC_UNUSED, GVariant* parameter, gpointer user_data G_GNUC_UNUSED)
6 {
7 const char* key = g_variant_get_string(parameter, nullptr);
8- gchar* uri = g_strdup_printf("settings:///system/%s", key);
9+ gchar* uri = g_strdup_printf("settings:///%s", key);
10+ g_debug("%s calling url_dispatch_send '%s'", G_STRLOC, uri);
11 url_dispatch_send(uri, on_uri_dispatched, nullptr);
12 g_free(uri);
13 }
14@@ -278,5 +279,5 @@
15 g_menu_append_item(submenu.get(), location);
16 g_object_unref(location);
17
18- g_menu_append(submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::security-privacy");
19+ g_menu_append(submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
20 }

Subscribers

People subscribed via source and target branches