diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-10-14 12:31:16 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-10-14 12:32:13 +0800 |
| commit | fecbf935f2b9be2cd6229099334279028fc517f1 (patch) | |
| tree | 055bc011da6b83f607016f10e8a5da5d7bc017d6 /libempathy-gtk/empathy-chat.c | |
| parent | 7b6b8da406493311445f6c2470a005a542972693 (diff) | |
| parent | 16e0d5a45bb1e11d57c4d5e512f021ebb6d2da12 (diff) | |
| download | gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.gz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.bz2 gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.lz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.xz gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.tar.zst gsoc2013-empathy-fecbf935f2b9be2cd6229099334279028fc517f1.zip | |
Merge remote-tracking branch 'pochu/error-dialog'
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index bdb97be3a..b1d469f3f 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -277,11 +277,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, |