[network-manager-applet/nma-0-9-8] editor: don't overwrite master name with master UUID

[Dan Williams <dcbw src gnome org>]

commit d68864f8e37e0fe64d6c165c0f313e568570c3e6
Author: Dan Williams <dcbw redhat com>
Date:   Wed Feb 27 13:00:24 2013 +0100

    editor: don't overwrite master name with master UUID
    
    This code was left over from when master interface names weren't
    as easy to deal with in the client code.  Plus, it tries to set
    the master property of the NMConnection, which doesn't have a
    master property.  It really wanted to set the master property
    of NMSettingConnection, but since we don't want to do that,
    and it was broken anyway, just remove it.

 src/connection-editor/page-master.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index a3d59ca..76d320b 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -205,13 +205,7 @@ connection_added (NMRemoteSettings *settings,
                return;
 
        interface_name = nm_connection_get_virtual_iface_name (CE_PAGE (self)->connection);
-       if (!strcmp (master, interface_name)) {
-               /* Ugh. Fix that... */
-               g_object_set (G_OBJECT (connection),
-                             NM_SETTING_CONNECTION_MASTER, priv->uuid,
-                             NULL);
-               nm_remote_connection_commit_changes (connection, NULL, NULL);
-       } else if (strcmp (master, priv->uuid) != 0)
+       if (strcmp (master, interface_name) != 0 && strcmp (master, priv->uuid) != 0)
                return;
 
        gtk_list_store_append (GTK_LIST_STORE (priv->connections_model), &iter);