diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-24 23:23:22 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-09-05 22:53:37 +0800 |
| commit | b499944f633b2c8b5efd7c19b27399520c46ae66 (patch) | |
| tree | da46ce5ab1610d9de72be36f6b375579b364fbe6 /libempathy/empathy-request-util.h | |
| parent | 2ab17b3039eef2c93d6fce4c5bee5f452fa8e8c1 (diff) | |
| download | gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.gz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.bz2 gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.lz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.xz gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.tar.zst gsoc2013-empathy-b499944f633b2c8b5efd7c19b27399520c46ae66.zip | |
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
Diffstat (limited to 'libempathy/empathy-request-util.h')
| -rw-r--r-- | libempathy/empathy-request-util.h | 10 |
1 files changed, 7 insertions, 3 deletions
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 |