diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 20:48:40 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 20:48:40 +0800 |
| commit | 72e7c137e1ce5f45c93583540b04fc106b2656d1 (patch) | |
| tree | cd677ec06bbbfbe53506e706be9e40497ffa3859 /libempathy | |
| parent | 8a8ba7a5697c6e5494854c99dc9aa4a7fc7a45bd (diff) | |
| download | gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.gz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.bz2 gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.lz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.xz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.zst gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.zip | |
empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of a TpConnection
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 13 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 09630e674..5e31fa71c 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1307,16 +1307,21 @@ dispatcher_chat_with_contact_id_cb (TpConnection *connection, } void -empathy_dispatcher_chat_with_contact_id (TpConnection *connection, - const gchar *contact_id, - gint64 timestamp) +empathy_dispatcher_chat_with_contact_id (TpAccount *account, + const gchar *contact_id, + gint64 timestamp) { EmpathyDispatcher *self; ChatWithContactIdData *data; + TpConnection *connection; - g_return_if_fail (TP_IS_CONNECTION (connection)); + g_return_if_fail (TP_IS_ACCOUNT (account)); g_return_if_fail (!EMP_STR_EMPTY (contact_id)); + connection = tp_account_get_connection (account); + if (connection == NULL) + return; + self = empathy_dispatcher_dup_singleton (); data = g_slice_new0 (ChatWithContactIdData); data->dispatcher = self; diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h index d49aa2dad..1fa6387f7 100644 --- a/libempathy/empathy-dispatcher.h +++ b/libempathy/empathy-dispatcher.h @@ -75,7 +75,7 @@ void empathy_dispatcher_create_channel (EmpathyDispatcher *dispatcher, gpointer user_data); /* Requesting 1 to 1 text channels */ -void empathy_dispatcher_chat_with_contact_id (TpConnection *connection, +void empathy_dispatcher_chat_with_contact_id (TpAccount *account, const gchar *contact_id, gint64 timestamp); |