Merge lp:~ted/indicator-network/drop-airplane into lp:indicator-network/13.10

[Ted Gould]

Drop Airplane Mode for Phone 1.0

Drops the airplane mode toggle switch at the top of the indicator as this won't be supported in Phone 1.0

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'network/device-wifi.vala'
--- network/device-wifi.vala	2013-09-16 04:07:59 +0000
+++ network/device-wifi.vala	2013-09-30 18:54:10 +0000
@@ -524,7 +524,7 @@
 				muxer: muxer
 			);
 
-			wifimenu = new WifiMenu(client, device, this._menu, actions, "indicator." + this.namespace + ".", false);
+			wifimenu = new WifiMenu(client, device, this._menu, actions, "indicator." + this.namespace + ".", show_settings);
 			wifiactionmanager = new WifiActionManager(actions, client, device);
 		}
 
 
=== modified file 'network/network-menu.vala'
--- network/network-menu.vala	2013-09-13 21:33:47 +0000
+++ network/network-menu.vala	2013-09-30 18:54:10 +0000
@@ -211,9 +211,13 @@
 
 			/* Put an airplane mode setting at the top of the desktop and phone
 			   menus */
-			var airplane = new Network.Settings.Airplane(muxer);
-			desktop.set_pre_settings(airplane);
-			phone.set_pre_settings(airplane);
+			/* Airplane mode is disabled for Phone 1.0 as there's no backend.
+			   commenting out to be reenabled after 1.0 ships */
+			if (false) {
+				var airplane = new Network.Settings.Airplane(muxer);
+				desktop.set_pre_settings(airplane);
+				phone.set_pre_settings(airplane);
+			}
 
 			/* Add some items at the end of the settings menu */
 			var wifisettings = new Network.Settings.Wifi(muxer);