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-gtk | |
| 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-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 6 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.c | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 032dd2464..cf01632b4 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -275,11 +275,13 @@ account_reconnected (EmpathyChat *chat, if (priv->sms_channel) empathy_sms_contact_id ( account, priv->id, - TP_USER_ACTION_TIME_NOT_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION, + NULL, NULL); else empathy_chat_with_contact_id ( account, priv->id, - TP_USER_ACTION_TIME_NOT_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION, + NULL, NULL); break; case TP_HANDLE_TYPE_ROOM: empathy_join_muc (account, priv->id, diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 745474d84..1a3dbb7e1 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -786,7 +786,8 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item, empathy_sms_contact_id ( empathy_contact_get_account (contact), empathy_contact_get_id (contact), - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); } GtkWidget * diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 1c4bbaad5..40c25974c 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -80,12 +80,14 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) { case EMP_NEW_MESSAGE_TEXT: empathy_chat_with_contact_id (account, contact_id, - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); break; case EMP_NEW_MESSAGE_SMS: empathy_sms_contact_id (account, contact_id, - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); break; default: |