[network-manager-applet/th/vpn-service-info-bgo767197] fixup! c-e: support multiple "Add VPN connection" entires per service-type

[Thomas Haller <thaller src gnome org>]

commit c6e682e9fc0d1ddccb4b14b02e030ce3b89479b0
Author: Thomas Haller <thaller redhat com>
Date:   Mon Jun 13 15:20:03 2016 +0200

    fixup! c-e: support multiple "Add VPN connection" entires per service-type

 src/connection-editor/ce-new-connection.ui |    2 --
 src/connection-editor/connection-helpers.c |    8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui
index 66e9ae8..39de66b 100644
--- a/src/connection-editor/ce-new-connection.ui
+++ b/src/connection-editor/ce-new-connection.ui
@@ -16,8 +16,6 @@
       <column type="GObject"/>
       <!-- column-name vpn_service_type, COL_VPN_SERVICE_TYPE -->
       <column type="gchararray"/>
-      <!-- column-name add_detail, COL_VPN_ADD_DETAIL -->
-      <column type="gchararray"/>
       <!-- column-name add_detail_key, COL_VPN_ADD_DETAIL_KEY -->
       <column type="gchararray"/>
       <!-- column-name add_detail_val, COL_VPN_ADD_DETAIL_VAL -->
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index d840cc2..a3c77bf 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -43,9 +43,8 @@
 #define COL_DESCRIPTION 3
 #define COL_VPN_PLUGIN 4
 #define COL_VPN_SERVICE_TYPE 5
-#define COL_VPN_ADD_DETAIL 6
-#define COL_VPN_ADD_DETAIL_KEY 7
-#define COL_VPN_ADD_DETAIL_VAL 8
+#define COL_VPN_ADD_DETAIL_KEY 6
+#define COL_VPN_ADD_DETAIL_VAL 7
 
 static gint
 sort_types (gconstpointer a, gconstpointer b)
@@ -347,7 +346,6 @@ set_up_connection_type_combo (GtkComboBox *combo,
                                                    COL_DESCRIPTION, i_description,
                                                    COL_VPN_PLUGIN, plugin,
                                                    COL_VPN_SERVICE_TYPE, service_type,
-                                                   COL_VPN_ADD_DETAIL, i_add_detail,
                                                    COL_VPN_ADD_DETAIL_KEY, i_add_detail_key,
                                                    COL_VPN_ADD_DETAIL_VAL, i_add_detail_val,
                                                    -1);
@@ -481,7 +479,6 @@ new_connection_dialog_full (GtkWindow *parent_window,
        int response;
        PageNewConnectionFunc new_func = NULL;
        gs_free char *vpn_service_type = NULL;
-       gs_free char *vpn_add_detail = NULL;
        gs_free char *vpn_add_detail_key = NULL;
        gs_free char *vpn_add_detail_val = NULL;
        const char *detail = NULL;
@@ -522,7 +519,6 @@ new_connection_dialog_full (GtkWindow *parent_window,
                gtk_tree_model_get (gtk_combo_box_get_model (combo), &iter,
                                    COL_NEW_FUNC, &new_func,
                                    COL_VPN_SERVICE_TYPE, &vpn_service_type,
-                                   COL_VPN_ADD_DETAIL, &vpn_add_detail,
                                    COL_VPN_ADD_DETAIL_KEY, &vpn_add_detail_key,
                                    COL_VPN_ADD_DETAIL_VAL, &vpn_add_detail_val,
                                    -1);