[network-manager-applet] all: remove last dbus-glib bits

[Lubomir Rintel <lkundrak src gnome org>]

commit ef036aba6948d892d8adaa2068dbd232d0e6fa8b
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Mar 8 18:49:49 2016 +0100

    all: remove last dbus-glib bits

 configure.ac                  |    2 --
 src/applet.c                  |    5 +----
 src/connection-editor/main.c  |    2 +-
 src/libnm-gtk/Makefile.am     |    2 --
 src/libnm-gtk/libnm-gtk.pc.in |    1 -
 5 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c5312a9..7b44085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,6 @@ else
     AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
 fi
 
-PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.74])
-
 PKG_CHECK_MODULES(LIBNM_GLIB,
                [gio-2.0 >= 2.32
                 NetworkManager >= 1.1
diff --git a/src/applet.c b/src/applet.c
index 41f102f..63bfbd0 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -979,10 +979,7 @@ activate_vpn_cb (GObject *client,
 
                title = _("VPN Connection Failed");
 
-               /* dbus-glib GError messages _always_ have two NULLs, the D-Bus error
-                * name comes after the first NULL.  Find it.
-                */
-               name = error->message + strlen (error->message) + 1;
+               name = g_dbus_error_get_remote_error (error);
                if (strstr (name, "ServiceStartFailed")) {
                        msg = g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service 
failed to start.\n\n%s"),
                                               info->vpn_name, error->message);
diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
index 552259c..a6cec81 100644
--- a/src/connection-editor/main.c
+++ b/src/connection-editor/main.c
@@ -26,12 +26,12 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#include <dbus/dbus.h>
 #include <glib-unix.h>
 
 #include "gsystem-local-alloc.h"
 #include "nm-connection-list.h"
 #include "nm-connection-editor.h"
+#include "nm-dbus-compat.h"
 
 gboolean nm_ce_keep_above;
 
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 85ff97d..f389e46 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -27,7 +27,6 @@ libnm_gtk_la_SOURCES = \
 libnm_gtk_la_CFLAGS = \
        $(GTK_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
-       $(DBUS_GLIB_CFLAGS) \
        $(GUDEV_CFLAGS) \
        -DLIBNM_GLIB_BUILD \
        -DICONDIR=\""$(datadir)/icons"\" \
@@ -47,7 +46,6 @@ libnm_gtk_la_CFLAGS = \
 libnm_gtk_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS) \
-       $(DBUS_GLIB_LIBS) \
        $(GUDEV_LIBS) \
        $(top_builddir)/src/wireless-security/libwireless-security-libnm-glib.la
 
diff --git a/src/libnm-gtk/libnm-gtk.pc.in b/src/libnm-gtk/libnm-gtk.pc.in
index c032a97..cd2abda 100644
--- a/src/libnm-gtk/libnm-gtk.pc.in
+++ b/src/libnm-gtk/libnm-gtk.pc.in
@@ -8,6 +8,5 @@ Name: libnm-gtk
 Description: NetworkManager UI utilities (libnm-glib version)
 Version: @PACKAGE_VERSION@
 Requires: NetworkManager >= ${nmversion} libnm-util >= ${nmversion} libnm-glib >= ${nmversion} gtk+-3.0 >= 
3.4
-Requires.private: dbus-glib-1
 Cflags: -I${includedir}/libnm-gtk
 Libs: -L${libdir} -lnm-gtk