[network-manager-applet: 4/4] merge: branch 'dcbw/die-die-die-dbus-glib-bgo760946'

[Dan Williams <dcbw src gnome org>]

commit 3be4d2fc2f8fa49f7c2a32858718a5751007b058
Merge: b49b1bf 096da06
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 19 11:30:38 2016 -0600

    merge: branch 'dcbw/die-die-die-dbus-glib-bgo760946'

 src/Makefile.am                                    |   13 +-
 src/applet-vpn-request.c                           |    2 -
 src/applet.c                                       |  219 ++----------
 src/applet.h                                       |   13 +-
 src/connection-editor/Makefile.am                  |   11 +-
 src/connection-editor/main.c                       |  407 +++++++++-----------
 .../nm-connection-editor-service.xml               |   10 -
 src/main.c                                         |   23 +-
 src/nm-applet-introspection.xml                    |   20 -
 9 files changed, 211 insertions(+), 507 deletions(-)
---