aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-24 23:23:22 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-26 17:55:30 +0800
commitdafe457f2620b7daea7435efa6a9066d53058896 (patch)
tree37494c03592ac75bc5be19db6ac68aba38241271 /libempathy-gtk
parent8a962c69bea601023d04ad6e2486115691efee63 (diff)
downloadgsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar.gz
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar.bz2
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar.lz
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar.xz
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.tar.zst
gsoc2013-empathy-dafe457f2620b7daea7435efa6a9066d53058896.zip
empathy_dispatcher_chat_with_contact_id(): add optional cb
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c6
-rw-r--r--libempathy-gtk/empathy-individual-menu.c3
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c6
3 files changed, 10 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 1063ad196..43ece8fac 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -258,11 +258,13 @@ account_reconnected (EmpathyChat *chat,
if (priv->sms_channel)
empathy_dispatcher_sms_contact_id (
account, priv->id,
- TP_USER_ACTION_TIME_NOT_USER_ACTION);
+ TP_USER_ACTION_TIME_NOT_USER_ACTION,
+ NULL, NULL);
else
empathy_dispatcher_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_dispatcher_join_muc (account, priv->id,
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 8b1ed66a7..d65f24ee2 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -566,7 +566,8 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
empathy_dispatcher_sms_contact_id (
empathy_contact_get_account (contact),
empathy_contact_get_id (contact),
- gtk_get_current_event_time ());
+ gtk_get_current_event_time (),
+ NULL, NULL);
}
GtkWidget *
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 1fe935d4e..2dc5793b4 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -85,12 +85,14 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
{
case EMP_NEW_MESSAGE_TEXT:
empathy_dispatcher_chat_with_contact_id (account, contact_id,
- gtk_get_current_event_time ());
+ gtk_get_current_event_time (),
+ NULL, NULL);
break;
case EMP_NEW_MESSAGE_SMS:
empathy_dispatcher_sms_contact_id (account, contact_id,
- gtk_get_current_event_time ());
+ gtk_get_current_event_time (),
+ NULL, NULL);
break;
default: