From b499944f633b2c8b5efd7c19b27399520c46ae66 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 24 May 2011 16:23:22 +0100 Subject: empathy_dispatcher_chat_with_contact_id(): add optional cb Conflicts: libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-new-message-dialog.c libempathy/empathy-dispatcher.c libempathy/empathy-dispatcher.h src/empathy-chat-manager.c src/empathy-chat-window.c --- libempathy/empathy-request-util.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'libempathy/empathy-request-util.h') diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 70a607e73..6781b72d4 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -45,9 +45,11 @@ G_BEGIN_DECLS /* Requesting 1 to 1 text channels */ void empathy_chat_with_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp); + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data); -void empathy_chat_with_contact (EmpathyContact *contact, +void empathy_chat_with_contact (EmpathyContact *contact, gint64 timestamp); /* Request a muc channel */ @@ -58,7 +60,9 @@ void empathy_join_muc (TpAccount *account, /* Request a sms channel */ void empathy_sms_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp); + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data); G_END_DECLS -- cgit v1.2.3