[network-manager-pptp/lr/libnm: 15/15] fixup! all: port to GDBus

[Lubomir Rintel <lkundrak src gnome org>]

commit d96030b1f90ece6802212d7bc20a41e32d4c281c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sun Aug 16 16:41:07 2015 +0200

    fixup! all: port to GDBus

 configure.ac          |    2 --
 src/Makefile.am       |    4 ----
 src/nm-pptp-service.c |    8 +++-----
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3ab299c..9e013f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,6 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
 
-PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.74)
-
 if test x"$with_gnome" != xno; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
        GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
diff --git a/src/Makefile.am b/src/Makefile.am
index 886c1e3..a1aa870 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS =                                                  \
-       $(DBUS_GLIB_CFLAGS)                                     \
        $(GLIB_CFLAGS)                                          \
        $(LIBNM_CFLAGS)                                         \
        -I${top_srcdir}                                         \
@@ -43,7 +42,6 @@ nm-pptp-pppd-service-dbus.c:
        @true
 
 nm_pptp_service_LDADD = \
-       $(DBUS_GLIB_LIBS) \
        $(GLIB_LIBS) \
        $(LIBNM_LIBS) \
        libnm-pptp-pppd-service-dbus.la
@@ -56,14 +54,12 @@ nm_pptp_pppd_plugin_la_SOURCES = \
        nm-ppp-status.h
 
 nm_pptp_pppd_plugin_la_CPPFLAGS = \
-       $(DBUS_GLIB_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBNM_CFLAGS)
 
 nm_pptp_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pptp_pppd_plugin_la_LIBADD = \
-       $(DBUS_GLIB_LIBS) \
        $(GLIB_LIBS) \
        $(LIBNM_LIBS)
 
diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c
index 1cfed4a..494e27e 100644
--- a/src/nm-pptp-service.c
+++ b/src/nm-pptp-service.c
@@ -44,7 +44,6 @@
 #include <netdb.h>
 
 #include <glib/gi18n.h>
-#include <dbus/dbus.h>
 
 #include <NetworkManager.h>
 
@@ -293,15 +292,14 @@ nm_pptp_ppp_service_new (const char *gwaddr,
        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error);
        if (!bus)
                return NULL;
-       dbus_connection_set_change_sigpipe (TRUE);
 
        proxy = g_dbus_proxy_new_sync (bus,
                                       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
                                       G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                       NULL,
-                                      DBUS_SERVICE_DBUS,
-                                      DBUS_PATH_DBUS,
-                                      DBUS_INTERFACE_DBUS,
+                                      "org.freedesktop.DBus",
+                                      "/org/freedesktop/DBus",
+                                      "org.freedesktop.DBus",
                                       NULL, error);
        g_assert (proxy);
        ret = g_dbus_proxy_call_sync (proxy,