[network-manager-applet/jk/master-as-ifname-rh1083186] fixup! editor: only change slave master properties if a new slave was added

[Jiří Klimeš <jklimes src gnome org>]

commit 199ddae2f16719e36746bf8965beb6ad2e705d19
Author: Jiří Klimeš <jklimes redhat com>
Date:   Mon Mar 16 16:14:29 2015 +0100

    fixup! editor: only change slave master properties if a new slave was added

 src/connection-editor/page-master.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 9f8d84a..58b3bc6 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -623,7 +623,7 @@ last_update (CEPage *page, NMConnection *connection, GError **error)
 {
        CEPageMaster *self = CE_PAGE_MASTER (page);
        CEPageMasterPrivate *priv = CE_PAGE_MASTER_GET_PRIVATE (self);
-       const char *interface_name, *tmp;
+       const char *interface_name, *tmp, *uuid;
        NMSettingConnection *s_con;
        GtkTreeIter iter;
 
@@ -645,7 +645,9 @@ last_update (CEPage *page, NMConnection *connection, GError **error)
                                            COL_CONNECTION, &rcon,
                                            -1);
                        tmp = nm_connection_get_interface_name (NM_CONNECTION (rcon));
-                       if (g_strcmp0 (interface_name, tmp) != 0) {
+                       uuid = nm_connection_get_uuid (NM_CONNECTION (rcon));
+                       if (   g_hash_table_contains (priv->new_slaves, uuid)
+                           && g_strcmp0 (interface_name, tmp) != 0) {
                                s_con = nm_connection_get_setting_connection (NM_CONNECTION (rcon));
                                g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, interface_name, NULL);
                                nm_remote_connection_commit_changes_async (rcon, TRUE, NULL, NULL, NULL);