When setting an EmpathyContact's Persona, disconnect existing signal handler

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 260543155810c89fd11e77560302b40aba08fc0d..ea78476a9264c8d345f937ba9e57cb5437e3f45d 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -822,7 +822,11 @@ empathy_contact_set_persona (EmpathyContact *contact,
     return;
 
   if (priv->persona != NULL)
-    g_object_unref (priv->persona);
+    {
+      g_signal_handlers_disconnect_by_func (priv->persona,
+          folks_persona_notify_cb, contact);
+      g_object_unref (priv->persona);
+    }
   priv->persona = g_object_ref (persona);
 
   g_signal_connect (priv->persona, "notify",