Make empathy_call_with_contact_id wait untill the handle for the contact is

discovered, before calling empathy_call_with_contact

1 files changed, 35 insertions, 3 deletions

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 8c6edafc5..2bcdfe1a6 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -456,6 +456,28 @@ empathy_call_with_contact (EmpathyContact *contact)
 #endif
 }
 
+#ifdef HAVE_VOIP
+struct empathy_call_cb_user_data {
+	guint handler;
+	GObject *factory;
+};
+
+static void
+empathy_call_with_contact_id_got_handle_cb (EmpathyContact *contact, 
+  GParamSpec *property, gpointer user_data) {
+
+	struct empathy_call_cb_user_data *ud =
+		(struct empathy_call_cb_user_data *) user_data;
+
+	g_signal_handler_disconnect (contact, ud->handler);
+
+	empathy_call_with_contact (contact);
+	g_object_unref (ud->factory);
+	g_object_unref (contact);
+	g_free (ud);
+}
+#endif
+
 void
 empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
 {
@@ -465,9 +487,19 @@ empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
 
 	factory = empathy_contact_factory_new ();
 	contact = empathy_contact_factory_get_from_id (factory, account, contact_id);
-	empathy_call_with_contact (contact);
-	g_object_unref (contact);
-	g_object_unref (factory);
+
+	if (empathy_contact_get_handle (contact) != 0) {
+		empathy_call_with_contact (contact);
+		g_object_unref (contact);
+		g_object_unref (factory);
+	} else {
+		struct empathy_call_cb_user_data *ud;
+		ud = g_malloc0 (sizeof (struct empathy_call_cb_user_data));
+		ud->factory = G_OBJECT (factory);
+		ud->handler = g_signal_connect (G_OBJECT (contact), "notify::handle",
+			G_CALLBACK (empathy_call_with_contact_id_got_handle_cb), ud);
+	}
+
 #endif
 }