Merge lp:~renatofilho/indicator-server/fix-1204661 into lp:indicator-server

[Renato Araujo Oliveira Filho]

Create the device enabled action even if the device is disabled during the service startup.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/indicator-server-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-i386-ci/3

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

I built the package from the branch, installed on my mako and tested.

On the third reboot, it failed, with the Mobile data toggle showing disabled, whereas querying NM via DBus shows that "WwanEnabled" is "true". I also let the phone blank the screen and pull down the indicator again and the same thing occurs.

@Renato, where you actually able to get it to fail locally on a device?

Also, I was expecting to see a changelog entry too...

review: Needs Fixing

[Tony Espy (awe)]

Just to be sure, I re-tested with the pre-built .deb that Bill Filler pointed me at, and was still able to get it to fail.

[lp:~renatofilho/indicator-server/fix-1204661]

238. By Renato Araujo Oliveira Filho on 2013-07-30

attempt to fix wrong 3g data information during the service startup.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/indicator-server-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-i386-ci/4

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

review: Approve (continuous-integration)

[lp:~renatofilho/indicator-server/fix-1204661]

239. By Renato Araujo Oliveira Filho on 2013-07-30

Fixed device switch to update when the deivice state change on the background.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/indicator-server-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-i386-ci/5

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

I'm going to approve because the fix definitely makes things better, however that said, I have a few comments that need to be addresses either in the UI component of the next-generation back-end which is supposed to land soon...

First, I did get the 'Mobile data' switch to come up in the wrong position once, however I looked away for a few seconds and when I looked back, it had toggled to 'On'. Weird.

Most of the time, when the network indicator is displayed, it's painted empty, the network list is added, then the toggle switches which are both off, and they both slide to on in tandem. I hope this lag in painting of the UI isn't by design, because it looks pretty bad. Also, every 20s or so, the menu re-paints ( I think this might be the update of the scanned networks ), and the toggle again do their dance from off to on.

Lastly, as there's no changelog entry, I'm not 'happroving' till the merge is updated.

review: Approve

[lp:~renatofilho/indicator-server/fix-1204661]

240. By Renato Araujo Oliveira Filho on 2013-07-31

bump version.

[Renato Araujo Oliveira Filho (renatofilho)]

change log updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/indicator-server-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-server-saucy-i386-ci/6

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-10 15:22:22 +0000
+++ debian/changelog	2013-07-31 02:33:28 +0000
@@ -1,3 +1,9 @@
+chewie (0.2.10) saucy; urgency=low
+
+  * Fixed device switcher state.
+
+ -- Renato Araujo Oliveira Filho <[e-mail]>  Tue, 30 Jul 2013 23:29:40 -0300
+
 chewie (0.2.9) saucy; urgency=low
 
   * new release with support for wifi/3g toggle 
 
=== modified file 'network/network-action-manager.vala'
--- network/network-action-manager.vala	2013-07-04 17:48:08 +0000
+++ network/network-action-manager.vala	2013-07-31 02:33:28 +0000
@@ -321,15 +321,23 @@
 		{
 			var wireless_enabled = new SimpleAction.stateful ("WirelessEnabled",
 			                                                  VariantType.BOOLEAN,
-			                                                  new Variant.boolean (client.wireless_get_enabled()));
+			                                                  new Variant.boolean (false));
 			app.add_action (wireless_enabled);
 			wireless_enabled.change_state.connect(on_device_enabled);
+			wireless_enabled.set_state (client.wireless_get_enabled());
+			client.notify["wireless-enabled"].connect((s, p) => {
+				wireless_enabled.set_state (client.wireless_get_enabled());
+			});		
 			
 			var mobile_data_enabled = new SimpleAction.stateful ("WwanEnabled",
 			                                                     VariantType.BOOLEAN,
-			                                                     new Variant.boolean (client.wwan_get_enabled()));
+																 new Variant.boolean (false));
 			app.add_action (mobile_data_enabled);
 			mobile_data_enabled.change_state.connect(on_device_enabled);
+			mobile_data_enabled.set_state (client.wwan_get_enabled());
+			client.notify["wwan-enabled"].connect((s, p) => {
+				mobile_data_enabled.set_state (client.wwan_get_enabled());
+			});
 
 			client.device_added.connect ((client, device) => {add_device (device);});
 			client.device_removed.connect ((client, device) => {remove_device (device);});
 
=== modified file 'network/network-menu.vala'
--- network/network-menu.vala	2013-07-04 01:49:38 +0000
+++ network/network-menu.vala	2013-07-31 02:33:28 +0000
@@ -326,21 +326,15 @@
 	
 			// switch
 			gmenu.insert_section(0, "Devices", devices_switch);
-			if (client.wireless_hardware_get_enabled())
-			{
-				MenuItem wireless_switch = new MenuItem("Wi-Fi", null);
-				wireless_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch"); 
-				wireless_switch.set_attribute ("action", "s", "WirelessEnabled");
-				devices_switch.append_item (wireless_switch);
-			}
+			MenuItem wireless_switch = new MenuItem("Wi-Fi", null);
+			wireless_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch"); 
+			wireless_switch.set_attribute ("action", "s", "WirelessEnabled");
+			devices_switch.append_item (wireless_switch);
 
-			if (client.wwan_hardware_get_enabled())
-			{
-				MenuItem mobile_data_switch = new MenuItem("Mobile data", null);
-				mobile_data_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch");
-				mobile_data_switch.set_attribute ("action", "s", "WwanEnabled");
-				devices_switch.append_item (mobile_data_switch);
-			}
+			MenuItem mobile_data_switch = new MenuItem("Mobile data", null);
+			mobile_data_switch.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.switch");
+			mobile_data_switch.set_attribute ("action", "s", "WwanEnabled");
+			devices_switch.append_item (mobile_data_switch);
 
 			var devices = client.get_devices ();