Merge lp:~philip.scott/wingpanel-indicator-network/captive-login into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

[Felipe Escoto]

run captive-login on network connect

Since the captive portal depended on nm-applet, this branch makes it run after it connects to a network.

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2015-07-13 17:16:52 +0000
+++ src/Indicator.vala	2016-04-21 00:32:53 +0000
@@ -20,6 +20,9 @@
 
 	Network.Widgets.PopoverWidget? popover_widget = null;
 
+	NetworkMonitor network_monitor;
+	bool captive_started = false;
+
 	public Indicator () {
 		Object (code_name: Wingpanel.Indicator.NETWORK,
 				display_name: _("Network"),
@@ -45,6 +48,7 @@
 			popover_widget.settings_shown.connect (() => { close (); });
 
 			on_state_changed ();
+			start_monitor ();
 		}
 
 		return popover_widget;
@@ -57,6 +61,23 @@
 		display_widget.update_state (popover_widget.state);
 	}
 
+    private void start_monitor () {
+        network_monitor = NetworkMonitor.get_default ();
+
+        network_monitor.network_changed.connect ((availabe) => {
+            if (!captive_started) {
+                if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) {
+                    var command = new Granite.Services.SimpleCommand ("/usr/bin/", "captive-login");
+                    command.done.connect (() => { captive_started = false; });
+
+                    captive_started = true;
+
+                    command.run ();
+                }
+            }
+        });
+    }
+
 	public override void opened () {
 		// TODO
 	}