#include <telepathy-glib/util.h>
#include "empathy-utils.h"
-#include "empathy-marshal.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY
#include "empathy-debug.h"
}
#ifdef HAVE_NM
+
+#if !defined(NM_CHECK_VERSION)
+#define NM_CHECK_VERSION(x,y,z) 0
+#endif
+
static void
connectivity_nm_state_change_cb (NMClient *client,
const GParamSpec *pspec,
state = nm_client_get_state (priv->nm_client);
new_nm_connected = !(state == NM_STATE_CONNECTING
+#if NM_CHECK_VERSION(0,8,992)
+ || state == NM_STATE_DISCONNECTING
+#endif
+ || state == NM_STATE_ASLEEP
|| state == NM_STATE_DISCONNECTED);
DEBUG ("New NetworkManager network state %d (connected: %s)", state,
"net.connman.Manager");
dbus_g_object_register_marshaller (
- _empathy_marshal_VOID__STRING,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_add_signal (priv->proxy, "StateChanged",
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- _empathy_marshal_VOID__BOOLEAN,
+ g_cclosure_marshal_generic,
G_TYPE_NONE,
1, G_TYPE_BOOLEAN, NULL);