[network-manager-applet: 6/6] all: merge branch 'th/shared-nm-default'

[Thomas Haller <thaller src gnome org>]

commit 5a93f9ea6961c2171c3b27b77d4452167a9121a2
Merge: 29956a7 aa69f9c
Author: Thomas Haller <thaller redhat com>
Date:   Tue Feb 16 20:22:06 2016 +0100

    all: merge branch 'th/shared-nm-default'

 configure.ac                                    |   14 +
 shared/Makefile.am                              |    7 +
 shared/gsystem-local-alloc.h                    |  208 +++
 shared/nm-dbus-compat.h                         |   74 +
 shared/nm-default.h                             |   63 +
 shared/nm-glib.h                                |  370 +++++
 shared/nm-macros-internal.h                     |  496 ++++++
 shared/nm-test-utils.h                          | 1867 +++++++++++++++++++++++
 src/Makefile.am                                 |    1 +
 src/ap-menu-item.c                              |    6 +-
 src/applet-agent.c                              |    6 +-
 src/applet-device-broadband.c                   |    6 +-
 src/applet-device-bt.c                          |    6 +-
 src/applet-device-ethernet.c                    |    6 +-
 src/applet-device-wifi.c                        |    6 +-
 src/applet-dialogs.c                            |    2 +
 src/applet-vpn-request.c                        |    5 +-
 src/applet.c                                    |    6 +-
 src/applet.h                                    |    4 -
 src/connection-editor/Makefile.am               |    1 +
 src/connection-editor/ce-page.c                 |    4 +-
 src/connection-editor/ce-polkit-button.c        |    4 +
 src/connection-editor/connection-helpers.c      |    4 +-
 src/connection-editor/ip4-routes-dialog.c       |    2 +
 src/connection-editor/ip6-routes-dialog.c       |    2 +
 src/connection-editor/main.c                    |    4 +-
 src/connection-editor/nm-connection-editor.c    |    2 +
 src/connection-editor/nm-connection-list.c      |    5 +-
 src/connection-editor/page-8021x-security.c     |    2 +
 src/connection-editor/page-bluetooth.c          |    2 +
 src/connection-editor/page-bond.c               |    2 +
 src/connection-editor/page-bridge-port.c        |    2 +
 src/connection-editor/page-bridge.c             |    2 +
 src/connection-editor/page-dcb.c                |    2 +
 src/connection-editor/page-dsl.c                |    2 +
 src/connection-editor/page-ethernet.c           |    2 +
 src/connection-editor/page-general.c            |    2 +
 src/connection-editor/page-infiniband.c         |    2 +
 src/connection-editor/page-ip4.c                |    2 +
 src/connection-editor/page-ip6.c                |    2 +
 src/connection-editor/page-master.c             |    2 +
 src/connection-editor/page-mobile.c             |    2 +
 src/connection-editor/page-ppp.c                |    2 +
 src/connection-editor/page-team-port.c          |    2 +
 src/connection-editor/page-team.c               |    2 +
 src/connection-editor/page-vlan.c               |    2 +
 src/connection-editor/page-vpn.c                |    2 +
 src/connection-editor/page-wifi-security.c      |    2 +
 src/connection-editor/page-wifi.c               |    2 +
 src/connection-editor/ppp-auth-methods-dialog.c |    4 +
 src/connection-editor/vpn-helpers.c             |    2 +
 src/ethernet-dialog.c                           |    6 +-
 src/libnm-gtk/Makefile.am                       |    2 +
 src/libnm-gtk/init.c                            |    2 +
 src/libnm-gtk/nm-mobile-providers.c             |    2 +
 src/libnm-gtk/nm-mobile-wizard.c                |    2 +
 src/libnm-gtk/nm-ui-utils.c                     |    6 +-
 src/libnm-gtk/nm-vpn-password-dialog.c          |    4 +-
 src/libnm-gtk/nm-wifi-dialog.c                  |    4 +-
 src/libnm-gtk/nm-wireless-dialog.c              |    4 +-
 src/libnm-gtk/tests/Makefile.am                 |    5 +-
 src/libnm-gtk/tests/test-mobile-providers.c     |   13 +-
 src/libnma/Makefile.am                          |    2 +
 src/libnma/init.c                               |    2 +
 src/libnma/nma-mobile-providers.c               |    2 +
 src/libnma/nma-mobile-wizard.c                  |    2 +
 src/libnma/nma-ui-utils.c                       |    6 +-
 src/libnma/nma-vpn-password-dialog.c            |    4 +-
 src/libnma/nma-wifi-dialog.c                    |    4 +-
 src/main.c                                      |    4 +-
 src/mb-menu-item.c                              |    6 +-
 src/mobile-helpers.c                            |    4 +
 src/utils/Makefile.am                           |    6 +-
 src/utils/tests/Makefile.am                     |    6 +-
 src/utils/tests/test-utils.c                    |   10 +-
 src/utils/utils.c                               |    5 +-
 src/wireless-security/Makefile.am               |    2 +
 src/wireless-security/eap-method-fast.c         |    2 +
 src/wireless-security/eap-method-leap.c         |    4 +
 src/wireless-security/eap-method-peap.c         |    2 +
 src/wireless-security/eap-method-simple.c       |    4 +
 src/wireless-security/eap-method-tls.c          |    2 +
 src/wireless-security/eap-method-ttls.c         |    2 +
 src/wireless-security/eap-method.c              |    2 +
 src/wireless-security/helpers.c                 |    4 +
 src/wireless-security/wireless-security.c       |    2 +
 src/wireless-security/ws-dynamic-wep.c          |    4 +
 src/wireless-security/ws-leap.c                 |    4 +
 src/wireless-security/ws-wep-key.c              |    4 +
 src/wireless-security/ws-wpa-eap.c              |    4 +
 src/wireless-security/ws-wpa-psk.c              |    4 +
 91 files changed, 3320 insertions(+), 68 deletions(-)
---