account-settings: allow to change the service

[empathy.git] / libempathy / empathy-connectivity.c

diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index ebd72b09d7fc39707ad191ce413367fa9668d222..f84505f9bd9426d5ba99ec32d0190216ef811eb0 100644 (file)
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -33,7 +33,6 @@
 #include <telepathy-glib/util.h>
 
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY
 #include "empathy-debug.h"
@@ -111,6 +110,7 @@ connectivity_nm_state_change_cb (NMClient *client,
 #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,
@@ -219,7 +219,7 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
           "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",
@@ -363,7 +363,7 @@ empathy_connectivity_class_init (EmpathyConnectivityClass *klass)
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        _empathy_marshal_VOID__BOOLEAN,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_BOOLEAN, NULL);