aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-connectivity.c9
-rw-r--r--libempathy/empathy-idle.c10
2 files changed, 12 insertions, 7 deletions
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 82ac9c9cb..8cc1d26bb 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -37,6 +37,7 @@
typedef struct {
#ifdef HAVE_NM
NMClient *nm_client;
+ gulong state_change_signal_id;
#endif
gboolean connected;
@@ -116,7 +117,8 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
priv->nm_client = nm_client_new ();
if (priv->nm_client != NULL)
{
- g_signal_connect (priv->nm_client, "notify::" NM_CLIENT_STATE,
+ priv->state_change_signal_id = g_signal_connect (priv->nm_client,
+ "notify::" NM_CLIENT_STATE,
G_CALLBACK (connectivity_nm_state_change_cb), connectivity);
connectivity_nm_state_change_cb (priv->nm_client, NULL, connectivity);
@@ -139,8 +141,9 @@ connectivity_finalize (GObject *object)
if (priv->nm_client != NULL)
{
- g_signal_handlers_disconnect_by_func (priv->nm_client,
- connectivity_nm_state_change_cb, connectivity);
+ g_signal_handler_disconnect (priv->nm_client,
+ priv->state_change_signal_id);
+ priv->state_change_signal_id = 0;
g_object_unref (priv->nm_client);
priv->nm_client = NULL;
}
diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index f408cf69b..ac0ca72f6 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -45,6 +45,7 @@ typedef struct {
MissionControl *mc;
DBusGProxy *gs_proxy;
EmpathyConnectivity *connectivity;
+ gulong state_change_signal_id;
TpConnectionPresenceType state;
gchar *status;
@@ -270,8 +271,9 @@ idle_finalize (GObject *object)
g_object_unref (priv->gs_proxy);
}
- g_signal_handlers_disconnect_by_func (priv->connectivity,
- idle_state_change_cb, object);
+ g_signal_handler_disconnect (priv->connectivity,
+ priv->state_change_signal_id);
+ priv->state_change_signal_id = 0;
g_object_unref (priv->connectivity);
@@ -482,8 +484,8 @@ empathy_idle_init (EmpathyIdle *idle)
}
priv->connectivity = empathy_connectivity_dup_singleton ();
- g_signal_connect (priv->connectivity, "state-change",
- G_CALLBACK (idle_state_change_cb), idle);
+ priv->state_change_signal_id = g_signal_connect (priv->connectivity,
+ "state-change", G_CALLBACK (idle_state_change_cb), idle);
}
EmpathyIdle *