From 6827dacb4b35da099c06c4add1696ad8876dda9f Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 17 Jul 2013 01:01:44 -0400
Subject: [PATCH] network: Remove syncDescription

Replace it with setDeviceDescription, which gives device wrappers
more control about how to handle description changes.

https://bugzilla.gnome.org/show_bug.cgi?id=704670
---
 js/ui/status/network.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 94f09d761..1da477a3e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -179,6 +179,7 @@ const NMConnectionSection = new Lang.Class({
 
         this.item.status.text = this._getStatus();
         this.item.icon.icon_name = this._getMenuIcon();
+        this.item.label.text = this._getDescription();
     },
 
     _getStatus: function() {
@@ -211,10 +212,6 @@ const NMConnectionSection = new Lang.Class({
         return new NMConnectionItem(this, connection);
     },
 
-    syncDescription: function() {
-        this.item.label.text = this._getDescription();
-    },
-
     checkConnection: function(connection) {
         if (!this._connectionValid(connection))
             return;
@@ -328,8 +325,13 @@ const NMConnectionDevice = new Lang.Class({
         this._device.disconnect(null);
     },
 
+    setDeviceDescription: function(desc) {
+        this._description = desc;
+        this._sync();
+    },
+
     _getDescription: function() {
-        return this._device._description;
+        return this._description;
     },
 
     _sync: function() {
@@ -574,8 +576,6 @@ const NMVPNSection = new Lang.Class({
 
     _init: function(client) {
         this.parent(client);
-
-        this.syncDescription();
         this._sync();
     },
 
@@ -768,9 +768,9 @@ const NMApplet = new Lang.Class({
         let names = NMGtk.utils_disambiguate_device_names(this._nmDevices);
         for (let i = 0; i < this._nmDevices.length; i++) {
             let device = this._nmDevices[i];
-            device._description = names[i];
+            let description = names[i];
             if (device._delegate)
-                device._delegate.syncDescription();
+                device._delegate.setDeviceDescription(description);
         }
     },