[empathy] Display invite dialog even if we don't know the inviter (#627228)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Display invite dialog even if we don't know the inviter (#627228)
- Date: Wed, 18 Aug 2010 14:09:39 +0000 (UTC)
commit 41c88d2a8b3670901473061dd53eb83e6f7ad34c
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Aug 18 15:20:56 2010 +0200
Display invite dialog even if we don't know the inviter (#627228)
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 5f2fdfa..fdd0672 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]