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

[Mathieu Trudel-Lapierre]

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

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

Unmerged revisions

=== modified file 'network/network-action-manager.vala'
--- network/network-action-manager.vala	2013-02-20 19:40:31 +0000
+++ network/network-action-manager.vala	2013-07-04 01:51:25 +0000
@@ -319,8 +319,17 @@
 
 		private void bootstrap_actions ()
 		{
-			//TODO: Airplane mode action
-			//TODO: Wifi enabled/disabled action
+			var wireless_enabled = new SimpleAction.stateful ("WirelessEnabled",
+			                                                  VariantType.BOOLEAN,
+			                                                  new Variant.boolean (client.wireless_get_enabled()));
+			app.add_action (wireless_enabled);
+			wireless_enabled.change_state.connect(on_device_enabled);
+			
+			var mobile_data_enabled = new SimpleAction.stateful ("WwanEnabled",
+			                                                     VariantType.BOOLEAN,
+			                                                     new Variant.boolean (client.wwan_get_enabled()));
+			app.add_action (mobile_data_enabled);
+			mobile_data_enabled.change_state.connect(on_device_enabled);
 
 			client.device_added.connect ((client, device) => {add_device (device);});
 			client.device_removed.connect ((client, device) => {remove_device (device);});
@@ -337,6 +346,19 @@
 			}
 		}
 
+		private void on_device_enabled(SimpleAction ac, Variant? val)
+		{
+			if (ac.name == "WirelessEnabled")
+			{
+				client.wireless_set_enabled (val.get_boolean());
+			}
+			else if (ac.name == "WwanEnabled")
+			{
+				client.wwan_set_enabled (val.get_boolean());
+			}
+			ac.set_state (val.get_boolean());
+		}
+
 		private void add_network_status_action ()
 		{
 			/* This is the action that represents the global status of the network.

=== modified file 'network/network-menu.vala'
--- network/network-menu.vala	2013-02-20 19:40:31 +0000
+++ network/network-menu.vala	2013-07-04 01:51:25 +0000
@@ -280,6 +280,7 @@
 	{
 		private Menu            root_menu;
 		private MenuItem        root_item;
+		private Menu	 	    devices_switch;
 		private Menu            gmenu;
 		private NM.Client       client;
 		private ActionManager   am;
@@ -314,6 +315,7 @@
 		private void bootstrap_menu ()
 		{
 			root_menu = new Menu ();
+			devices_switch = new Menu ();
 			gmenu     = new Menu ();
 			am        = new ActionManager (this, client);
 
@@ -321,6 +323,24 @@
 			root_item.set_attribute (GLib.Menu.ATTRIBUTE_ACTION, "s", "network-status");
 			root_item.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root.network");
 			root_menu.append_item (root_item);
+	
+			// 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);
+			}
+
+			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);
+			}
 
 			var devices = client.get_devices ();