#include <telepathy-glib/util.h>
#include <libempathy/empathy-dispatcher.h>
-#include <libempathy/empathy-contact-factory.h>
+#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-tp-chat.h>
#include <libempathy/empathy-tp-call.h>
-#include <libempathy/empathy-tp-group.h>
+#include <libempathy/empathy-tp-file.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
EmpathyContact *contact;
/* Tube dispatcher if applicable */
EmpathyTubeDispatch *tube_dispatch;
- /* option signal handler */
+ /* option signal handler and it's instance */
gulong handler;
+ GObject *handler_instance;
/* optional accept widget */
GtkWidget *dialog;
} EventManagerApproval;
approval->invalidated_handler);
g_object_unref (approval->operation);
+ if (approval->handler != 0)
+ g_signal_handler_disconnect (approval->handler_instance,
+ approval->handler);
+
if (approval->contact != NULL)
g_object_unref (approval->contact);
{
tp_chat = EMPATHY_TP_CHAT
(empathy_dispatch_operation_get_channel_wrapper (event->approval->operation));
-
+
g_signal_handler_disconnect (tp_chat, event->approval->handler);
event->approval->handler = 0;
}
return;
}
- dialog = gtk_message_dialog_new (GTK_WINDOW (empathy_main_window_get()),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, _("Incoming call"));
gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog),
}
static void
-event_manager_media_channel_got_name_cb (EmpathyContact *contact,
- const GError *error, gpointer user_data, GObject *object)
+event_manager_media_channel_got_contact (EventManagerApproval *approval)
{
- EventManagerApproval *approval = user_data;
gchar *header;
- if (error != NULL)
- {
- /* FIXME just returning assuming the operation will be invalidated as
- * well */
- return;
- }
-
header = g_strdup_printf (_("Incoming call from %s"),
- empathy_contact_get_name (contact));
+ empathy_contact_get_name (approval->contact));
event_manager_add (approval->manager,
approval->contact, EMPATHY_IMAGE_VOIP, header, NULL,
event_manager_start_ringing (approval->manager);
}
-static void
-event_manager_media_channel_got_contact (EventManagerApproval *approval)
-{
- empathy_contact_call_when_ready (approval->contact,
- EMPATHY_CONTACT_READY_NAME, event_manager_media_channel_got_name_cb,
- approval, NULL, G_OBJECT (approval->manager));
-}
-
static void
event_manager_media_channel_contact_changed_cb (EmpathyTpCall *call,
GParamSpec *param, EventManagerApproval *approval)
}
static void
-event_manager_tube_got_contact_name_cb (EmpathyContact *contact,
- const GError *error, gpointer user_data, GObject *object)
+event_manager_tube_got_contact_cb (EmpathyTpContactFactory *factory,
+ EmpathyContact *contact,
+ const GError *error,
+ gpointer user_data,
+ GObject *object)
{
EventManagerApproval *approval = (EventManagerApproval *)user_data;
EmpathyTubeDispatchAbility dispatchability;
if (error != NULL)
{
- /* FIXME?, we assume that the operation gets invalidated as well (if it
- * didn't already */
- return;
+ /* FIXME: We should probably still display the event */
+ DEBUG ("Error: %s", error->message);
+ return;
}
+ approval->contact = g_object_ref (contact);
+
dispatchability = empathy_tube_dispatch_is_dispatchable
(approval->tube_dispatch);
-
switch (dispatchability)
{
case EMPATHY_TUBE_DISPATCHABILITY_UNKNOWN:
approval->handler = g_signal_connect (approval->tube_dispatch,
"notify::dispatchability",
G_CALLBACK (event_manager_tube_dispatch_ability_cb), approval);
+ approval->handler_instance = G_OBJECT (approval->tube_dispatch);
break;
case EMPATHY_TUBE_DISPATCHABILITY_POSSIBLE:
/* fallthrough */
{
EmpathyTpChat *tp_chat;
TpChannel *channel;
- EmpathyTpGroup *group;
- EmpathyContact *self_contact;
+ TpHandle self_handle;
+ GArray *members;
gtk_widget_destroy (GTK_WIDGET (approval->dialog));
approval->dialog = NULL;
if (empathy_dispatch_operation_claim (approval->operation))
empathy_tp_chat_close (tp_chat);
- empathy_tp_chat_close (tp_chat);
return;
}
/* join the room */
channel = empathy_tp_chat_get_channel (tp_chat);
- group = empathy_tp_group_new (channel);
- empathy_run_until_ready (group);
+ self_handle = tp_channel_group_get_self_handle (channel);
+ members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
+ g_array_append_val (members, self_handle);
- self_contact = empathy_tp_group_get_self_contact (group);
- empathy_tp_group_add_member (group, self_contact, NULL);
+ tp_cli_channel_interface_group_call_add_members (channel, -1, members,
+ "", NULL, NULL, NULL, NULL);
empathy_dispatch_operation_approve (approval->operation);
- g_object_unref (group);
- g_object_unref (self_contact);
+ g_array_free (members, TRUE);
}
static void
event->approval->dialog = dialog;
}
+static void
+event_manager_muc_invite_got_contact_cb (EmpathyTpContactFactory *factory,
+ EmpathyContact *contact,
+ const GError *error,
+ gpointer user_data,
+ GObject *object)
+{
+ EventManagerApproval *approval = (EventManagerApproval *) user_data;
+ TpChannel *channel;
+ 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);
+ channel = empathy_dispatch_operation_get_channel (approval->operation);
+
+ self_handle = tp_channel_group_get_self_handle (channel);
+ tp_channel_group_get_local_pending_info (channel, self_handle, NULL, NULL,
+ &invite_msg);
+
+ msg = g_strdup_printf (_("%s invited you to join %s"),
+ empathy_contact_get_name (approval->contact),
+ tp_channel_get_identifier (channel));
+
+ event_manager_add (approval->manager,
+ approval->contact, EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg,
+ approval, event_room_channel_process_func, NULL);
+
+ empathy_sound_play (empathy_main_window_get (),
+ EMPATHY_SOUND_CONVERSATION_NEW);
+
+ g_free (msg);
+}
+
static void
event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
EmpathyDispatchOperation *operation, EmpathyEventManager *manager)
EMPATHY_TP_CHAT (
empathy_dispatch_operation_get_channel_wrapper (operation));
TpChannel *channel = empathy_tp_chat_get_channel (tp_chat);
- TpHandle handle;
- TpHandleType handle_type;
-
- handle = tp_channel_get_handle (channel, &handle_type);
- if (handle_type == TP_HANDLE_TYPE_CONTACT)
+ if (tp_proxy_has_interface (channel, TP_IFACE_CHANNEL_INTERFACE_GROUP))
{
- /* 1-1 text channel, wait for the first message */
- approval->handler = g_signal_connect (tp_chat, "message-received",
- G_CALLBACK (event_manager_chat_message_received_cb), approval);
- }
- else if (handle_type == TP_HANDLE_TYPE_ROOM)
- {
- EmpathyTpGroup *group;
- EmpathyPendingInfo *info;
- gchar *msg;
+ /* Are we in local-pending ? */
+ TpHandle self_handle, inviter;
- group = empathy_tp_group_new (channel);
- empathy_run_until_ready (group);
- info = empathy_tp_group_get_invitation (group, NULL);
+ self_handle = tp_channel_group_get_self_handle (channel);
- if (info == NULL)
+ if (self_handle != 0 && tp_channel_group_get_local_pending_info (
+ channel, self_handle, &inviter, NULL, NULL))
{
- DEBUG ("can't handle a incoming muc to which we have not been "
- "invited");
-
- if (empathy_dispatch_operation_claim (approval->operation))
- empathy_tp_chat_close (tp_chat);
-
- g_object_unref (group);
- return;
- }
+ /* We are invited to a room */
+ EmpathyTpContactFactory *factory;
+ TpConnection *connection;
- /* We are invited to a room */
- msg = g_strdup_printf ("%s invited you to join %s",
- empathy_contact_get_name (info->actor),
- tp_channel_get_identifier (channel));
+ DEBUG ("Have been invited to %s. Ask user if he wants to accept",
+ tp_channel_get_identifier (channel));
- approval->contact = g_object_ref (info->actor);
+ connection = empathy_tp_chat_get_connection (tp_chat);
+ factory = empathy_tp_contact_factory_dup_singleton (connection);
- event_manager_add (approval->manager,
- info->actor, EMPATHY_IMAGE_GROUP_MESSAGE, msg, info->message,
- approval, event_room_channel_process_func, NULL);
+ empathy_tp_contact_factory_get_from_handle (factory,
+ inviter, event_manager_muc_invite_got_contact_cb,
+ approval, NULL, G_OBJECT (manager));
- empathy_sound_play (empathy_main_window_get (),
- EMPATHY_SOUND_CONVERSATION_NEW);
+ g_object_unref (factory);
+ return;
+ }
- g_object_unref (group);
+ /* if we are not invited, let's wait for the first message */
}
+
+ /* 1-1 text channel, wait for the first message */
+ approval->handler = g_signal_connect (tp_chat, "message-received",
+ G_CALLBACK (event_manager_chat_message_received_cb), approval);
+ approval->handler_instance = G_OBJECT (tp_chat);
}
else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA))
{
}
}
- else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
{
- EmpathyContact *contact;
- gchar *header;
- TpHandle handle;
- McAccount *account;
- EmpathyContactFactory *factory;
- TpChannel *channel = empathy_dispatch_operation_get_channel (operation);
-
- factory = empathy_contact_factory_dup_singleton ();
- handle = tp_channel_get_handle (channel, NULL);
- account = empathy_channel_get_account (channel);
-
- contact = empathy_contact_factory_get_from_handle (factory, account,
- handle);
+ EmpathyTpFile *file;
+ gchar *header;
- empathy_contact_run_until_ready (contact,
- EMPATHY_CONTACT_READY_NAME, NULL);
+ file = EMPATHY_TP_FILE (empathy_dispatch_operation_get_channel_wrapper (operation));
+ approval->contact = g_object_ref (empathy_tp_file_get_contact (file));
header = g_strdup_printf (_("Incoming file transfer from %s"),
- empathy_contact_get_name (contact));
+ empathy_contact_get_name (approval->contact));
- event_manager_add (manager, contact, EMPATHY_IMAGE_DOCUMENT_SEND,
+ event_manager_add (manager, approval->contact, EMPATHY_IMAGE_DOCUMENT_SEND,
header, NULL, approval, event_channel_process_func, NULL);
/* FIXME better sound for incoming file transfers ?*/
empathy_sound_play (empathy_main_window_get (),
EMPATHY_SOUND_CONVERSATION_NEW);
- g_object_unref (factory);
- g_object_unref (account);
g_free (header);
}
else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE) ||
!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
{
- EmpathyContact *contact;
- TpHandle handle;
- TpHandleType handle_type;
- McAccount *account;
- EmpathyContactFactory *factory;
- EmpathyTubeDispatch *tube_dispatch;
TpChannel *channel;
+ TpHandle handle;
+ TpHandleType handle_type;
+ TpConnection *connection;
+ EmpathyTpContactFactory *factory;
channel = empathy_dispatch_operation_get_channel (operation);
-
handle = tp_channel_get_handle (channel, &handle_type);
/* Only understand p2p tubes */
if (handle_type != TP_HANDLE_TYPE_CONTACT)
return;
- factory = empathy_contact_factory_dup_singleton ();
- account = empathy_channel_get_account (channel);
-
- contact = empathy_contact_factory_get_from_handle (factory, account,
- handle);
-
- tube_dispatch = empathy_tube_dispatch_new (operation);
-
- approval->contact = contact;
- approval->tube_dispatch = tube_dispatch;
-
- empathy_contact_call_when_ready (contact,
- EMPATHY_CONTACT_READY_NAME, event_manager_tube_got_contact_name_cb,
- approval, NULL, G_OBJECT (manager));
-
- g_object_unref (factory);
- g_object_unref (account);
+ approval->tube_dispatch = empathy_tube_dispatch_new (operation);
+ connection = tp_channel_borrow_connection (channel);
+ factory = empathy_tp_contact_factory_dup_singleton (connection);
+ empathy_tp_contact_factory_get_from_handle (factory, handle,
+ event_manager_tube_got_contact_cb, approval, NULL, G_OBJECT (manager));
}
else
{
{
EventPriv *event = l->data;
- if (event->public.contact == contact &&
- event->func == event_pending_subscribe_func)
- {
- event_remove (event);
- break;
+ if (event->public.contact == contact &&
+ event->func == event_pending_subscribe_func)
+ {
+ event_remove (event);
+ break;
+ }
}
- }
return;
}
- empathy_contact_run_until_ready (contact, EMPATHY_CONTACT_READY_NAME, NULL);
-
header = g_strdup_printf (_("Subscription requested by %s"),
empathy_contact_get_name (contact));
projects / empathy.git / blobdiff