* Sjoerd Simons <sjoerd.simons@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
-#include <string.h>
#include <glib/gi18n.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-approver.h>
+#include "empathy-presence-manager.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-tp-chat.h"
+#include "empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-sasl-mechanisms.h"
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <extensions/extensions.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-call-utils.h>
+#include "empathy-images.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-call-utils.h"
+#include "empathy-subscription-dialog.h"
#include "empathy-event-manager.h"
-#include "empathy-roster-window.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
EmpathyMessage *message,
EventManagerApproval *approval)
{
- GtkWidget *window;
EmpathyContact *sender;
const gchar *header;
const gchar *msg;
EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg,
approval, event_text_channel_process_func, NULL);
- window = empathy_roster_window_dup ();
-
- empathy_sound_manager_play (priv->sound_mgr, window,
+ empathy_sound_manager_play (priv->sound_mgr, NULL,
EMPATHY_SOUND_CONVERSATION_NEW);
-
- g_object_unref (window);
}
static void
static void
display_invite_room_dialog (EventManagerApproval *approval)
{
- GtkWidget *window = empathy_roster_window_dup ();
const gchar *invite_msg;
gchar *msg;
TpContact *self_contact;
EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg, approval,
event_room_channel_process_func, NULL);
- empathy_sound_manager_play (priv->sound_mgr, window,
+ empathy_sound_manager_play (priv->sound_mgr, NULL,
EMPATHY_SOUND_CONVERSATION_NEW);
g_free (msg);
- g_object_unref (window);
-}
-
-static void
-event_manager_ft_got_contact_cb (TpConnection *connection,
- EmpathyContact *contact,
- const GError *error,
- gpointer user_data,
- GObject *object)
-{
- EventManagerApproval *approval = (EventManagerApproval *) user_data;
- GtkWidget *window = empathy_roster_window_dup ();
- char *header;
- EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
-
- approval->contact = g_object_ref (contact);
-
- header = g_strdup_printf (_("Incoming file transfer from %s"),
- empathy_contact_get_alias (approval->contact));
-
- event_manager_add (approval->manager, NULL,
- approval->contact, EMPATHY_EVENT_TYPE_TRANSFER,
- EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL,
- approval, event_channel_process_func, NULL);
-
- /* FIXME better sound for incoming file transfers ?*/
- empathy_sound_manager_play (priv->sound_mgr, window,
- EMPATHY_SOUND_CONVERSATION_NEW);
-
- g_free (header);
- g_object_unref (window);
}
static void
{
TpChannel *channel = TP_CHANNEL (call);
EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
- GtkWidget *window;
gchar *header;
gboolean video;
approval->handler = g_signal_connect (call, "state-changed",
G_CALLBACK (event_manager_call_state_changed_cb), approval);
- window = empathy_roster_window_dup ();
-
g_object_get (G_OBJECT (call), "initial-video", &video, NULL);
header = g_strdup_printf (
priv->ringing++;
if (priv->ringing == 1)
- empathy_sound_manager_start_playing (priv->sound_mgr, window,
+ empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
-
- g_object_unref (window);
}
static void
TpAddDispatchOperationContext *context,
TpFileTransferChannel *ft)
{
- TpHandle handle;
TpChannel *channel = TP_CHANNEL (ft);
- TpConnection *connection = tp_channel_borrow_connection (channel);
+ EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
+ gchar *header;
approval->handler_instance = g_object_ref (ft);
+ approval_set_target_contact (approval, channel);
- handle = tp_channel_get_handle (channel, NULL);
+ tp_add_dispatch_operation_context_accept (context);
- empathy_tp_contact_factory_get_from_handle (connection, handle,
- event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (self));
+ header = g_strdup_printf (_("Incoming file transfer from %s"),
+ empathy_contact_get_alias (approval->contact));
- tp_add_dispatch_operation_context_accept (context);
+ event_manager_add (approval->manager, NULL,
+ approval->contact, EMPATHY_EVENT_TYPE_TRANSFER,
+ EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL,
+ approval, event_channel_process_func, NULL);
+
+ /* FIXME better sound for incoming file transfers ?*/
+ empathy_sound_manager_play (priv->sound_mgr, NULL,
+ EMPATHY_SOUND_CONVERSATION_NEW);
+
+ g_free (header);
}
static void
TpAddDispatchOperationContext *context,
TpChannel *channel)
{
- GHashTable *props;
- const gchar * const *available_mechanisms;
-
- props = tp_channel_borrow_immutable_properties (channel);
- available_mechanisms = tp_asv_get_boxed (props,
- TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS,
- G_TYPE_STRV);
-
- if (tp_strv_contains (available_mechanisms, "X-TELEPATHY-PASSWORD"))
+ if (empathy_sasl_channel_supports_mechanism (channel, "X-TELEPATHY-PASSWORD"))
{
event_manager_add (approval->manager, account, NULL,
EMPATHY_EVENT_TYPE_AUTH,
static void
event_pending_subscribe_func (EventPriv *event)
{
- empathy_subscription_dialog_show (event->public.contact, event->public.header,
- NULL);
+ GtkWidget *dialog;
+ FolksIndividual *individual;
+
+ individual = empathy_ensure_individual_from_tp_contact (
+ empathy_contact_get_tp_contact (event->public.contact));
+
+ dialog = empathy_subscription_dialog_new (individual, event->public.message);
+ gtk_window_present (GTK_WINDOW (dialog));
+
event_remove (event);
+
+ g_object_unref (individual);
}
static void
EmpathyEventManagerPriv *priv = GET_PRIV (manager);
TpAccount *account;
EmpathyPresenceManager *presence_mgr;
- GtkWidget *window = empathy_roster_window_dup ();
account = empathy_contact_get_account (contact);
presence_mgr = empathy_presence_manager_dup_singleton ();
TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0)
{
/* someone is logging off */
- empathy_sound_manager_play (priv->sound_mgr, window,
+ empathy_sound_manager_play (priv->sound_mgr, NULL,
EMPATHY_SOUND_CONTACT_DISCONNECTED);
if (g_settings_get_boolean (priv->gsettings_notif,
TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
{
/* someone is logging in */
- empathy_sound_manager_play (priv->sound_mgr, window,
+ empathy_sound_manager_play (priv->sound_mgr, NULL,
EMPATHY_SOUND_CONTACT_CONNECTED);
if (g_settings_get_boolean (priv->gsettings_notif,
out:
g_object_unref (presence_mgr);
- g_object_unref (window);
}
static GObject *
projects / empathy.git / blobdiff