Merge lp:~naaando/wingpanel-indicator-network/wingpanel-indicator-network into lp:~wingpanel-devs/wingpanel-indicator-network/trunk

[Fernando da Silva Sousa]

Use "network-wireless-offline-symbolic" icon when no ethernet card available (lp:1507360)

Shows wireless offline symbol as default network offline symbol if any ethernet card can be found.

p.s.: The truly "default" symbol still is "network-offline-symbolic", which is triggered if any case match(means no wireless card was found too), should I change this too?

[Leonardo Lemos (leonardolemos)]

review: Approve

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:wingpanel-indicator-network failed due to conflicts:

text conflict in src/common/Utils.vala

[Cody Garver (codygarver)]

Thanks you for this contribution!

This bug had a $15 bounty attached to it, you can claim it here: https://www.bountysource.com/issues/27504720-use-network-wireless-offline-symbolic-when-no-ethernet-card-available

[Fernando da Silva Sousa (naaando)]

Due to text conflict I rewrote the code based on the last updates, can I abort this merge and resubmit? The branch was already overwritten with the newer.

review: Needs Fixing

[Cody Garver (codygarver)]

Hi Fernando,

Because the bot complained, I manually merged this code and resolve the conflicts myself.

You can see the final result of the merge here: http://bazaar.launchpad.net/~wingpanel-devs/wingpanel-indicator-network/trunk/revision/218

If you have improvements to the final result's code, please start a new branch and merge proposal.

[Fernando da Silva Sousa (naaando)]

review: Abstain

=== modified file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	2016-11-21 02:42:01 +0000
+++ src/Widgets/DisplayWidget.vala	2016-12-15 08:32:46 +0000
@@ -84,7 +84,10 @@
             });
             break;
         case Network.State.DISCONNECTED:
-            image.icon_name = "network-offline-symbolic";
+            image.icon_name = "network-wireless-offline-symbolic";
+            break;
+        case Network.State.WIRED_UNPLUGGED:
+            image.icon_name = "network-wired-offline-symbolic";
             break;
         default:
             image.icon_name = "network-offline-symbolic";

=== modified file 'src/Widgets/EtherInterface.vala'
--- src/Widgets/EtherInterface.vala	2016-11-04 16:42:19 +0000
+++ src/Widgets/EtherInterface.vala	2016-12-15 08:32:46 +0000
@@ -56,12 +56,12 @@
         case NM.DeviceState.UNAVAILABLE:
             ethernet_item.sensitive = false;
             ethernet_item.set_active (false);
-            state = State.DISCONNECTED;
+            state = State.WIRED_UNPLUGGED;
             break;
         case NM.DeviceState.DISCONNECTED:
             ethernet_item.sensitive = true;
             ethernet_item.set_active (false);
-            state = State.DISCONNECTED;
+            state = State.WIRED_UNPLUGGED;
             break;
 
         case NM.DeviceState.PREPARE:

=== modified file 'src/common/Utils.vala'
--- src/common/Utils.vala	2016-11-03 19:48:54 +0000
+++ src/common/Utils.vala	2016-12-15 08:32:46 +0000
@@ -18,8 +18,10 @@
 
 public enum Network.State {
     DISCONNECTED,
-    DISCONNECTED_WIRED,
+    WIRED_UNPLUGGED,
+    DISCONNECTED_WIRED, //Deprecated
     CONNECTED_WIRED,
+    CONNECTED_VPN,
     CONNECTED_WIFI,
     CONNECTED_WIFI_WEAK,
     CONNECTED_WIFI_OK,
@@ -27,8 +29,10 @@
     CONNECTED_WIFI_EXCELLENT,
     CONNECTING_WIFI,
     CONNECTING_WIRED,
+    CONNECTING_VPN,
     FAILED_WIRED,
-    FAILED_WIFI
+    FAILED_WIFI,
+    FAILED_VPN
 }
 
 namespace Network.Common.Utils {
@@ -42,17 +46,19 @@
         case Network.State.CONNECTED_WIFI_GOOD:
         case Network.State.CONNECTED_WIFI_EXCELLENT:
         case Network.State.CONNECTED_WIRED:
+        case Network.State.CONNECTED_VPN:
             return _("Connected");
         case Network.State.FAILED_WIRED:
         case Network.State.FAILED_WIFI:
+        case Network.State.FAILED_VPN:
             return _("Failed");
         case Network.State.CONNECTING_WIFI:
         case Network.State.CONNECTING_WIRED:
+        case Network.State.CONNECTING_VPN:
             return _("Connecting");
-        case Network.State.DISCONNECTED_WIRED:
+        case Network.State.WIRED_UNPLUGGED:
             return _("Cable unplugged");
         }
         return _("Unknown");
     }
 }
-

=== modified file 'src/common/Widgets/AbstractEtherInterface.vala'
--- src/common/Widgets/AbstractEtherInterface.vala	2016-11-03 22:24:46 +0000
+++ src/common/Widgets/AbstractEtherInterface.vala	2016-12-15 08:32:46 +0000
@@ -39,7 +39,7 @@
 		case NM.DeviceState.UNKNOWN:
 		case NM.DeviceState.UNMANAGED:
 		case NM.DeviceState.UNAVAILABLE:
-			state = State.DISCONNECTED_WIRED;
+			state = State.WIRED_UNPLUGGED;
 			break;
 
 		/* virtually not working */