31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff -up ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal ypbind-mt-1.35/src/ypbind_dbus_nm.c
|
|
--- ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal 2012-03-23 13:48:21.000000000 +0100
|
|
+++ ypbind-mt-1.35/src/ypbind_dbus_nm.c 2012-04-18 14:40:50.574569893 +0200
|
|
@@ -32,6 +32,9 @@
|
|
#include <dbus/dbus-glib-lowlevel.h>
|
|
#include <dbus/dbus-glib.h>
|
|
|
|
+/* We have our own constant, NM uses directly "StateChanged" string */
|
|
+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
|
|
+
|
|
#ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H
|
|
#include <NetworkManager/NetworkManager.h>
|
|
#include <NetworkManager/NetworkManagerVPN.h>
|
|
@@ -39,7 +42,6 @@
|
|
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
|
|
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
|
|
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
|
|
-#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
|
|
|
|
typedef enum NMState {
|
|
NM_STATE_UNKNOWN = 0,
|
|
@@ -160,7 +162,7 @@ dbus_filter (DBusConnection *connection,
|
|
handled = DBUS_HANDLER_RESULT_HANDLED;
|
|
}
|
|
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE,
|
|
- NM_DBUS_VPN_SIGNAL_STATE_CHANGE))
|
|
+ NM_DBUS_SIGNAL_STATE_CHANGED))
|
|
{
|
|
NMState state = NM_STATE_UNKNOWN;
|
|
|