diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-18 21:20:56 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-18 21:20:56 +0800 |
| commit | 41c88d2a8b3670901473061dd53eb83e6f7ad34c (patch) | |
| tree | 38b6fb76ef5944d3c9e9ea03a3cc37557bd86056 /src | |
| parent | 35cde642055edd0334283ad63224608e0f388fdb (diff) | |
| download | gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar.gz gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar.bz2 gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar.lz gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar.xz gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.tar.zst gsoc2013-empathy-41c88d2a8b3670901473061dd53eb83e6f7ad34c.zip | |
Display invite dialog even if we don't know the inviter (#627228)
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-event-manager.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 5f2fdfae1..fdd0672ee 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -771,12 +771,12 @@ event_manager_muc_invite_got_contact_cb (TpConnection *connection, if (error != NULL) { - /* FIXME: We should probably still display the event */ DEBUG ("Error: %s", error->message); - return; } - - approval->contact = g_object_ref (contact); + else + { + approval->contact = g_object_ref (contact); + } display_invite_room_dialog (approval); } @@ -890,9 +890,16 @@ approve_channels (TpSimpleApprover *approver, DEBUG ("Have been invited to %s. Ask user if he wants to accept", tp_channel_get_identifier (channel)); - empathy_tp_contact_factory_get_from_handle (connection, - inviter, event_manager_muc_invite_got_contact_cb, - approval, NULL, G_OBJECT (self)); + if (inviter != 0) + { + empathy_tp_contact_factory_get_from_handle (connection, + inviter, event_manager_muc_invite_got_contact_cb, + approval, NULL, G_OBJECT (self)); + } + else + { + display_invite_room_dialog (approval); + } goto out; } |