Merge remote branch 'origin/master' into rm-userset

diff --cc cli/src/connections.c
index 20b681b,5099b50..606fdda
--- 1/cli/src/connections.c
--- 2/cli/src/connections.c
+++ b/cli/src/connections.c
@@@ -57,27 -60,32 +57,29 @@@ static NmcOutputField nmc_fields_con_st
        {"NAME",          N_("NAME"),         25, NULL, 0},  /* 0 */
        {"UUID",          N_("UUID"),         38, NULL, 0},  /* 1 */
        {"DEVICES",       N_("DEVICES"),      10, NULL, 0},  /* 2 */
 -      {"SCOPE",         N_("SCOPE"),         8, NULL, 0},  /* 3 */
 -      {"DEFAULT",       N_("DEFAULT"),       8, NULL, 0},  /* 4 */
 -      {"DBUS-SERVICE",  N_("DBUS-SERVICE"), 45, NULL, 0},  /* 5 */
 -      {"SPEC-OBJECT",   N_("SPEC-OBJECT"),  10, NULL, 0},  /* 6 */
 -      {"VPN",           N_("VPN"),           5, NULL, 0},  /* 7 */
 -      {"DBUS-PATH",     N_("DBUS-PATH"),    51, NULL, 0},  /* 8 */
 +      {"DEFAULT",       N_("DEFAULT"),       8, NULL, 0},  /* 3 */
 +      {"SPEC-OBJECT",   N_("SPEC-OBJECT"),  10, NULL, 0},  /* 4 */
 +      {"VPN",           N_("VPN"),           5, NULL, 0},  /* 5 */
++      {"DBUS-PATH",     N_("DBUS-PATH"),    51, NULL, 0},  /* 6 */
        {NULL,            NULL,                0, NULL, 0}
  };
- #define NMC_FIELDS_CON_STATUS_ALL     "NAME,UUID,DEVICES,DEFAULT,VPN,SPEC-OBJECT"
 -#define NMC_FIELDS_CON_STATUS_ALL     "NAME,UUID,DEVICES,SCOPE,DEFAULT,VPN,DBUS-SERVICE,DBUS-PATH,SPEC-OBJECT"
 -#define NMC_FIELDS_CON_STATUS_COMMON  "NAME,UUID,DEVICES,SCOPE,DEFAULT,VPN"
++#define NMC_FIELDS_CON_STATUS_ALL     "NAME,UUID,DEVICES,DEFAULT,VPN,DBUS-PATH,SPEC-OBJECT"
 +#define NMC_FIELDS_CON_STATUS_COMMON  "NAME,UUID,DEVICES,DEFAULT,VPN"
  
  /* Available fields for 'con list' */
  static NmcOutputField nmc_fields_con_list[] = {
        {"NAME",            N_("NAME"),           25, NULL, 0},  /* 0 */
        {"UUID",            N_("UUID"),           38, NULL, 0},  /* 1 */
        {"TYPE",            N_("TYPE"),           17, NULL, 0},  /* 2 */
 -      {"SCOPE",           N_("SCOPE"),           8, NULL, 0},  /* 3 */
 -      {"TIMESTAMP",       N_("TIMESTAMP"),      12, NULL, 0},  /* 4 */
 -      {"TIMESTAMP-REAL",  N_("TIMESTAMP-REAL"), 34, NULL, 0},  /* 5 */
 -      {"AUTOCONNECT",     N_("AUTOCONNECT"),    13, NULL, 0},  /* 6 */
 -      {"READONLY",        N_("READONLY"),       10, NULL, 0},  /* 7 */
 -      {"DBUS-PATH",       N_("DBUS-PATH"),      42, NULL, 0},  /* 8 */
 +      {"TIMESTAMP",       N_("TIMESTAMP"),      12, NULL, 0},  /* 3 */
 +      {"TIMESTAMP-REAL",  N_("TIMESTAMP-REAL"), 34, NULL, 0},  /* 4 */
 +      {"AUTOCONNECT",     N_("AUTOCONNECT"),    13, NULL, 0},  /* 5 */
 +      {"READONLY",        N_("READONLY"),       10, NULL, 0},  /* 6 */
++      {"DBUS-PATH",       N_("DBUS-PATH"),      42, NULL, 0},  /* 7 */
        {NULL,              NULL,                  0, NULL, 0}
  };
- #define NMC_FIELDS_CON_LIST_ALL     "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY"
 -#define NMC_FIELDS_CON_LIST_ALL     "NAME,UUID,TYPE,SCOPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY,DBUS-PATH"
 -#define NMC_FIELDS_CON_LIST_COMMON  "NAME,UUID,TYPE,SCOPE,TIMESTAMP-REAL"
++#define NMC_FIELDS_CON_LIST_ALL     "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY,DBUS-PATH"
 +#define NMC_FIELDS_CON_LIST_COMMON  "NAME,UUID,TYPE,TIMESTAMP-REAL"
  
  
  /* Helper macro to define fields */
@@@ -373,10 -382,12 +376,11 @@@ show_connection (NMConnection *data, gp
                nmc->allowed_fields[0].value = nm_setting_connection_get_id (s_con);
                nmc->allowed_fields[1].value = nm_setting_connection_get_uuid (s_con);
                nmc->allowed_fields[2].value = nm_setting_connection_get_connection_type (s_con);
 -              nmc->allowed_fields[3].value = nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM ? _("system") : _("user");
 -              nmc->allowed_fields[4].value = timestamp_str;
 -              nmc->allowed_fields[5].value = timestamp ? timestamp_real_str : _("never");
 -              nmc->allowed_fields[6].value = nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no");
 -              nmc->allowed_fields[7].value = nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no");
 -              nmc->allowed_fields[8].value = nm_connection_get_path (connection);
 +              nmc->allowed_fields[3].value = timestamp_str;
 +              nmc->allowed_fields[4].value = timestamp ? timestamp_real_str : _("never");
 +              nmc->allowed_fields[5].value = nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no");
 +              nmc->allowed_fields[6].value = nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no");
++              nmc->allowed_fields[7].value = nm_connection_get_path (connection);
  
                nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */
                print_fields (nmc->print_fields, nmc->allowed_fields);
@@@ -546,15 -600,18 +550,16 @@@ show_active_connection (gpointer data, 
                        g_assert (s_con != NULL);
  
                        /* Obtain field values */
 -                      info->nmc->allowed_fields[0].value = nm_setting_connection_get_id (s_con);
 -                      info->nmc->allowed_fields[1].value = nm_setting_connection_get_uuid (s_con);
 -                      info->nmc->allowed_fields[2].value = dev_str->str;
 -                      info->nmc->allowed_fields[3].value = active_service_scope == NM_CONNECTION_SCOPE_SYSTEM ? _("system") : _("user");
 -                      info->nmc->allowed_fields[4].value = nm_active_connection_get_default (active) ? _("yes") : _("no");
 -                      info->nmc->allowed_fields[5].value = nm_active_connection_get_service_name (active);
 -                      info->nmc->allowed_fields[6].value = nm_active_connection_get_specific_object (active);
 -                      info->nmc->allowed_fields[7].value = NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no");
 -                      info->nmc->allowed_fields[8].value = nm_object_get_path (NM_OBJECT (active));
 -
 -                      info->nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */
 -                      print_fields (info->nmc->print_fields, info->nmc->allowed_fields);
 +                      nmc->allowed_fields[0].value = nm_setting_connection_get_id (s_con);
 +                      nmc->allowed_fields[1].value = nm_setting_connection_get_uuid (s_con);
 +                      nmc->allowed_fields[2].value = dev_str->str;
 +                      nmc->allowed_fields[3].value = nm_active_connection_get_default (active) ? _("yes") : _("no");
 +                      nmc->allowed_fields[4].value = nm_active_connection_get_specific_object (active);
 +                      nmc->allowed_fields[5].value = NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no");
++                      nmc->allowed_fields[6].value = nm_object_get_path (NM_OBJECT (active));
 +
 +                      nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */
 +                      print_fields (nmc->print_fields, nmc->allowed_fields);
                        break;
                }
        }

diff --cc introspection/Makefile.am
index a2667ca,212da3a..0092504
--- 1/introspection/Makefile.am
--- 2/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@@ -17,8 -17,8 +17,7 @@@ EXTRA_DIST = 
        nm-manager.xml \
        nm-manager-client.xml \
        nm-settings.xml \
--      nm-settings-system.xml \
 -      nm-exported-connection.xml \
 +      nm-sysconfig-connection.xml \
        nm-vpn-plugin.xml \
        nm-vpn-connection.xml \
        nm-ppp-manager.xml \

diff --cc introspection/nm-manager-client.xml
Simple merge

diff --cc introspection/nm-manager.xml
Simple merge

diff --cc man/nmcli.1.in
Simple merge

diff --cc src/nm-device.c
Simple merge

diff --cc src/nm-manager.c
Simple merge

diff --cc src/nm-manager.h
Simple merge

diff --cc src/nm-policy.c
Simple merge

diff --cc src/system-settings/nm-sysconfig-settings.c
Simple merge

diff --cc src/vpn-manager/nm-vpn-connection.c
Simple merge

diff --cc system-settings/plugins/ifupdown/plugin.c
Simple merge

diff --cc system-settings/plugins/keyfile/nm-keyfile-connection.c
index 514e1ae,3c27a54..e149869
--- 1/system-settings/plugins/keyfile/nm-keyfile-connection.c
--- 2/system-settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c
@@@ -30,8 -31,15 +30,9 @@@
  #include "nm-keyfile-connection.h"
  #include "reader.h"
  #include "writer.h"
+ #include "common.h"
  
 -static NMSettingsConnectionInterface *parent_settings_connection_iface;
 -
 -static void settings_connection_interface_init (NMSettingsConnectionInterface *klass);
 -
 -G_DEFINE_TYPE_EXTENDED (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SYSCONFIG_CONNECTION, 0,
 -                        G_IMPLEMENT_INTERFACE (NM_TYPE_SETTINGS_CONNECTION_INTERFACE,
 -                                               settings_connection_interface_init))
 +G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SYSCONFIG_CONNECTION)
  
  #define NM_KEYFILE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_KEYFILE_CONNECTION, NMKeyfileConnectionPrivate))
  

diff --cc system-settings/plugins/keyfile/plugin.c
Simple merge

diff --cc system-settings/plugins/keyfile/writer.c
index 6eed7bb,ffac35c..c6c9bbb
--- 1/system-settings/plugins/keyfile/io/writer.c
--- 2/system-settings/plugins/keyfile/writer.c
+++ b/system-settings/plugins/keyfile/writer.c
@@@ -36,11 -36,11 +36,12 @@@
  #include <string.h>
  #include <arpa/inet.h>
  #include <netinet/ether.h>
+ #include <ctype.h>
  
  #include "nm-dbus-glib-types.h"
 +#include "nm-system-config-error.h"
  #include "writer.h"
- #include "reader.h"
+ #include "common.h"
  
  static gboolean
  write_array_of_uint (GKeyFile *file,