diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-19 00:11:58 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-19 00:11:58 +0800 |
commit | bfb75bb92f7e1a4aa93a9e144b781faf03df93eb (patch) | |
tree | 700eb3afadb8e17d8035a92ee0e30ab018adb495 /src/empathy.c | |
parent | 13699e023a50f88055f24c0230c28a7163c8356d (diff) | |
parent | 247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb (diff) | |
download | gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.gz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.bz2 gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.lz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.xz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.zst gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.zip |
Merge branch 'approvers-redone-599158'
Diffstat (limited to 'src/empathy.c')
-rw-r--r-- | src/empathy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c index 5a6b13199..2c7ea2a7f 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -131,7 +131,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher, empathy_chat_window_present_chat (chat, empathy_dispatch_operation_get_user_action_time (operation)); - if (empathy_tp_chat_is_invited (tp_chat)) + if (empathy_tp_chat_is_invited (tp_chat, NULL)) { /* We have been invited to the room. Add ourself as member as this * channel has been approved. */ |