aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-event-manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r--src/empathy-event-manager.c37
1 files changed, 22 insertions, 15 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 39d70e6d1..3139c503e 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -727,27 +727,13 @@ event_room_channel_process_func (EventPriv *event)
}
static void
-event_manager_muc_invite_got_contact_cb (TpConnection *connection,
- EmpathyContact *contact,
- const GError *error,
- gpointer user_data,
- GObject *object)
+display_invite_room_dialog (EventManagerApproval *approval)
{
- EventManagerApproval *approval = (EventManagerApproval *) user_data;
GtkWidget *window = empathy_main_window_dup ();
const gchar *invite_msg;
gchar *msg;
TpHandle self_handle;
- if (error != NULL)
- {
- /* FIXME: We should probably still display the event */
- DEBUG ("Error: %s", error->message);
- return;
- }
-
- approval->contact = g_object_ref (contact);
-
self_handle = tp_channel_group_get_self_handle (approval->main_channel);
tp_channel_group_get_local_pending_info (approval->main_channel, self_handle,
NULL, NULL, &invite_msg);
@@ -767,6 +753,27 @@ event_manager_muc_invite_got_contact_cb (TpConnection *connection,
}
static void
+event_manager_muc_invite_got_contact_cb (TpConnection *connection,
+ EmpathyContact *contact,
+ const GError *error,
+ gpointer user_data,
+ GObject *object)
+{
+ EventManagerApproval *approval = (EventManagerApproval *) user_data;
+
+ if (error != NULL)
+ {
+ /* FIXME: We should probably still display the event */
+ DEBUG ("Error: %s", error->message);
+ return;
+ }
+
+ approval->contact = g_object_ref (contact);
+
+ display_invite_room_dialog (approval);
+}
+
+static void
event_manager_ft_got_contact_cb (TpConnection *connection,
EmpathyContact *contact,
const GError *error,