Wingpanel Network Indicator

Merge lp:~djaler1/wingpanel-indicator-network/fix-1463575 into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

  1. fix-1463575
  2. Merge into trunk
Proposed by Kirill Romanov
Status: Merged
Approved by: Danielle Foré
Approved revision: 210
Merged at revision: 210
Proposed branch: lp:~djaler1/wingpanel-indicator-network/fix-1463575
Merge into: lp:~wingpanel-devs/wingpanel-indicator-network/trunk
Diff against target: 72 lines (+18/-6)
3 files modified
src/Widgets/DisplayWidget.vala (+3/-0)
src/common/Utils.vala (+3/-0)
src/common/Widgets/NMVisualizer.vala (+12/-6)
To merge this branch: bzr merge lp:~djaler1/wingpanel-indicator-network/fix-1463575
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+313935@code.launchpad.net

Commit message

use "airplane-mode-symbolic" when Airplane mode is engaged

Description of the change

Fix bug 1463575

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/DisplayWidget.vala'
2--- src/Widgets/DisplayWidget.vala 2016-11-21 02:42:01 +0000
3+++ src/Widgets/DisplayWidget.vala 2017-01-01 11:00:11 +0000
4@@ -40,6 +40,9 @@
5 }
6
7 switch (state) {
8+ case Network.State.DISCONNECTED_AIRPLANE_MODE:
9+ image.icon_name = "airplane-mode-symbolic";
10+ break;
11 case Network.State.CONNECTING_WIRED:
12 image.icon_name = "network-wired-acquiring-symbolic";
13 break;
14
15=== modified file 'src/common/Utils.vala'
16--- src/common/Utils.vala 2016-11-03 19:48:54 +0000
17+++ src/common/Utils.vala 2017-01-01 11:00:11 +0000
18@@ -19,6 +19,7 @@
19 public enum Network.State {
20 DISCONNECTED,
21 DISCONNECTED_WIRED,
22+ DISCONNECTED_AIRPLANE_MODE,
23 CONNECTED_WIRED,
24 CONNECTED_WIFI,
25 CONNECTED_WIFI_WEAK,
26@@ -51,6 +52,8 @@
27 return _("Connecting");
28 case Network.State.DISCONNECTED_WIRED:
29 return _("Cable unplugged");
30+ case Network.State.DISCONNECTED_AIRPLANE_MODE:
31+ return _("Airplane mode enabled");
32 }
33 return _("Unknown");
34 }
35
36=== modified file 'src/common/Widgets/NMVisualizer.vala'
37--- src/common/Widgets/NMVisualizer.vala 2016-11-21 02:42:01 +0000
38+++ src/common/Widgets/NMVisualizer.vala 2017-01-01 11:00:11 +0000
39@@ -38,6 +38,8 @@
40
41 nm_client.device_added.connect (device_added_cb);
42 nm_client.device_removed.connect (device_removed_cb);
43+
44+ nm_client.notify["networking-enabled"].connect (update_state);
45
46 var devices = nm_client.get_devices ();
47 for (var i = 0; i < devices.length; i++)
48@@ -137,14 +139,18 @@
49 }
50
51 void update_state () {
52- var next_state = Network.State.DISCONNECTED;
53- foreach (var inter in network_interface) {
54- if (inter.state != Network.State.DISCONNECTED) {
55- next_state = inter.state;
56+ if (!nm_client.networking_get_enabled ()) {
57+ state = Network.State.DISCONNECTED_AIRPLANE_MODE;
58+ } else {
59+ var next_state = Network.State.DISCONNECTED;
60+ foreach (var inter in network_interface) {
61+ if (inter.state != Network.State.DISCONNECTED) {
62+ next_state = inter.state;
63+ }
64 }
65+
66+ state = next_state;
67 }
68-
69- state = next_state;
70 }
71
72 void update_vpn_connection () {

Subscribers

People subscribed via source and target branches

to all changes: