Merge remote-tracking branch 'origin/rm-userset'

There; it's merged.  Yay!

diff --cc cli/src/connections.c
index 8e88a45,d33a0c2..f96f774
--- 1/cli/src/connections.c
--- 2/cli/src/connections.c
+++ b/cli/src/connections.c
@@@ -684,19 -624,11 +631,12 @@@ do_connections_status (NmCli *nmc, int 
        nmc->print_fields.header_name = _("Active connections");
        print_fields (nmc->print_fields, nmc->allowed_fields);
  
-       if (active_cons && active_cons->len) {
-               info = g_malloc0 (sizeof (StatusInfo));
-               info->nmc = nmc;
-               info->scope = NM_CONNECTION_SCOPE_SYSTEM;
-               g_ptr_array_foreach ((GPtrArray *) active_cons, show_active_connection, (gpointer) info);
-               info->scope = NM_CONNECTION_SCOPE_USER;
-               g_ptr_array_foreach ((GPtrArray *) active_cons, show_active_connection, (gpointer) info);
-               g_free (info);
-       }
 +      nmc->get_client (nmc);
 +      active_cons = nm_client_get_active_connections (nmc->client);
+       if (active_cons && active_cons->len)
+               g_ptr_array_foreach ((GPtrArray *) active_cons, show_active_connection, (gpointer) nmc);
  
  error:
 -
        return nmc->return_value;
  }
  
@@@ -1563,22 -1493,10 +1501,21 @@@ do_connection_up (NmCli *nmc, int argc
                goto error;
        }
  
 -      /* create NMClient */
 -      if (!nmc->get_client (nmc))
 +      if (!nmc_is_nm_running (nmc, &error)) {
 +              if (error) {
 +                      g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message);
 +                      nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 +                      g_error_free (error);
 +              } else {
 +                      g_string_printf (nmc->return_text, _("Error: NetworkManager is not running."));
 +                      nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
 +              }
                goto error;
 +      }
 +
 +      /* create NMClient */
 +      nmc->get_client (nmc);
  
-       is_system = (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) ? TRUE : FALSE;
        con_path = nm_connection_get_path (connection);
  
        s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
@@@ -1666,23 -1579,11 +1600,22 @@@ do_connection_down (NmCli *nmc, int arg
                goto error;
        }
  
 -      /* create NMClient */
 -      if (!nmc->get_client (nmc))
 +      if (!nmc_is_nm_running (nmc, &error)) {
 +              if (error) {
 +                      g_string_printf (nmc->return_text, _("Error: Can't find out if NetworkManager is running: %s."), error->message);
 +                      nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
 +                      g_error_free (error);
 +              } else {
 +                      g_string_printf (nmc->return_text, _("Error: NetworkManager is not running."));
 +                      nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING;
 +              }
                goto error;
 +      }
 +
 +      /* create NMClient */
 +      nmc->get_client (nmc);
  
        con_path = nm_connection_get_path (connection);
-       con_scope = nm_connection_get_scope (connection);
  
        active_cons = nm_client_get_active_connections (nmc->client);
        for (i = 0; active_cons && (i < active_cons->len); i++) {

diff --cc cli/src/nmcli.c
Simple merge

diff --cc cli/src/nmcli.h
Simple merge

diff --cc libnm-glib/nm-client.c
Simple merge

diff --cc libnm-util/nm-setting-ip4-config.c
Simple merge

diff --cc man/NetworkManager.conf.5.in
index 2d7a9e8,20a8e3a..d047f39
--- 1/man/NetworkManager.conf.5.in
--- 2/man/NetworkManager.conf.5.in
+++ b/man/NetworkManager.conf.5.in
@@@ -160,13 -160,13 +160,13 @@@ from earlier levels; thus setting the l
  warning messages.
  .TP
  .B domains=\fI<domain1>,<domain2>, ...\fP
 -The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB,
 +The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
  DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
- USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
- itself, logging is disabled.  MB = Mobile Broadband, USER_SET = user settings
- operations and communication, SYS_SET = system settings service operations, OLPC
- = OLPC Mesh device operations, CORE = core daemon operations, DEVICE = activation
- and general interface operations.
+ AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX].  When "NONE" is given by
+ itself, logging is disabled.  MB = Mobile Broadband, AGENTS = secret agents
+ operations and communication, SETTINGS = settings/config service operations,
+ OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE =
+ activation and general interface operations.
  .SH "SEE ALSO"
  .BR http://live.gnome.org/NetworkManager/SystemSettings
  .sp

diff --cc po/hu.po
index 79ee46a,942b17b..f76c564
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -1905,12 -1776,11 +1905,12 @@@ msgstr "Ismeretlen naplózási tartomá
  msgid "NOTE: the libc resolver may not support more than 3 nameservers."
  msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgálót."
  
 -#: ../src/dns-manager/nm-dns-manager.c:386
 +#: ../src/dns-manager/nm-dns-manager.c:369
  msgid "The nameservers listed below may not be recognized."
 -msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
 +msgstr ""
 +"Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
  
- #: ../src/system-settings/nm-default-wired-connection.c:157
+ #: ../src/settings/nm-default-wired-connection.c:157
  #, c-format
  msgid "Auto %s"
  msgstr "Automatikus %s"

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

diff --cc src/main.c
Simple merge

diff --cc system-settings/plugins/ifcfg-rh/reader.c
Simple merge

diff --cc system-settings/plugins/ifcfg-rh/writer.c
Simple merge