Indicator server

Merge lp:~cyphermox/indicator-server/null-detailed-action into lp:indicator-server

  1. null-detailed-action
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 234
Merged at revision: 234
Proposed branch: lp:~cyphermox/indicator-server/null-detailed-action
Merge into: lp:indicator-server
Prerequisite: lp:~renatofilho/indicator-server/device-switch
Diff against target: 21 lines (+2/-2)
1 file modified
network/network-menu.vala (+2/-2)
To merge this branch: bzr merge lp:~cyphermox/indicator-server/null-detailed-action
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Review via email: mp+172940@code.launchpad.net

This proposal supersedes a proposal from 2013-07-04.

Commit message

Make the Wi-Fi and Mobile data switches have null for a detailed-action when building the menuitem rather than an empty string.

Description of the change

Make the Wi-Fi and Mobile data switches have null for a detailed-action when building the menuitem rather than an empty string.

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

FAILED: Continuous integration, rev:234
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mathieu-tl/indicator-server/null-detailed-action/+merge/172940/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-server-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-i386-ci/1

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, wifi seems to be working now, 3g should be fixed later today still.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'network/network-menu.vala'
2--- network/network-menu.vala 2013-07-04 01:52:32 +0000
3+++ network/network-menu.vala 2013-07-04 01:52:32 +0000
4@@ -328,7 +328,7 @@
5 gmenu.insert_section(0, "Devices", devices_switch);
6 if (client.wireless_hardware_get_enabled())
7 {
8- MenuItem wireless_switch = new MenuItem("Wi-Fi", "");
9+ MenuItem wireless_switch = new MenuItem("Wi-Fi", null);
10 wireless_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch");
11 wireless_switch.set_attribute ("action", "s", "WirelessEnabled");
12 devices_switch.append_item (wireless_switch);
13@@ -336,7 +336,7 @@
14
15 if (client.wwan_hardware_get_enabled())
16 {
17- MenuItem mobile_data_switch = new MenuItem("Mobile data", "");
18+ MenuItem mobile_data_switch = new MenuItem("Mobile data", null);
19 mobile_data_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch");
20 mobile_data_switch.set_attribute ("action", "s", "WwanEnabled");
21 devices_switch.append_item (mobile_data_switch);

Subscribers

People subscribed via source and target branches