#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/util.h>
#include <telepathy-glib/interfaces.h>
+ #include <telepathy-glib/simple-approver.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-tp-file.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
+#include <libempathy/empathy-gsettings.h>
#include <extensions/extensions.h>
-#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-sound.h>
typedef struct {
EmpathyEventManager *manager;
- EmpathyDispatchOperation *operation;
- gulong approved_handler;
- gulong claimed_handler;
+ TpChannelDispatchOperation *operation;
gulong invalidated_handler;
/* Remove contact if applicable */
EmpathyContact *contact;
GObject *handler_instance;
/* optional accept widget */
GtkWidget *dialog;
+ /* Channel of the CDO that will be used during the approval */
+ TpChannel *main_channel;
} EventManagerApproval;
typedef struct {
EmpathyDispatcher *dispatcher;
+ TpBaseClient *approver;
EmpathyContactManager *contact_manager;
GSList *events;
/* Ongoing approvals */
static EventManagerApproval *
event_manager_approval_new (EmpathyEventManager *manager,
- EmpathyDispatchOperation *operation)
+ TpChannelDispatchOperation *operation,
+ TpChannel *main_channel)
{
EventManagerApproval *result = g_slice_new0 (EventManagerApproval);
result->operation = g_object_ref (operation);
result->manager = manager;
+ result->main_channel = g_object_ref (main_channel);
return result;
}
static void
event_manager_approval_free (EventManagerApproval *approval)
{
- g_signal_handler_disconnect (approval->operation,
- approval->approved_handler);
- g_signal_handler_disconnect (approval->operation,
- approval->claimed_handler);
g_signal_handler_disconnect (approval->operation,
approval->invalidated_handler);
g_object_unref (approval->operation);
+ g_object_unref (approval->main_channel);
+
if (approval->handler != 0)
g_signal_handler_disconnect (approval->handler_instance,
approval->handler);
+ if (approval->handler_instance != NULL)
+ g_object_unref (approval->handler_instance);
+
if (approval->contact != NULL)
g_object_unref (approval->contact);
}
static void
- event_channel_process_func (EventPriv *event)
+ handle_with_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+ {
+ TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_handle_with_finish (cdo, result, &error))
+ {
+ DEBUG ("HandleWith failed: %s\n", error->message);
+ g_error_free (error);
+ }
+ }
+
+ static void
+ handle_with_time_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+ {
+ TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_handle_with_time_finish (cdo, result,
+ &error))
+ {
+ if (g_error_matches (error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED))
+ {
+ EventManagerApproval *approval = user_data;
+
+ DEBUG ("HandleWithTime() is not implemented, falling back to "
+ "HandleWith(). Please upgrade to telepathy-mission-control "
+ "5.5.0 or later");
+
+ tp_channel_dispatch_operation_handle_with_async (approval->operation,
+ NULL, handle_with_cb, approval);
+ }
+ else
+ {
+ DEBUG ("HandleWithTime failed: %s\n", error->message);
+ }
+ g_error_free (error);
+ }
+ }
+
+ static void
+ event_manager_approval_approve (EventManagerApproval *approval)
{
gint64 timestamp = gtk_get_current_event_time ();
+
if (timestamp == GDK_CURRENT_TIME)
timestamp = EMPATHY_DISPATCHER_CURRENT_TIME;
- empathy_dispatch_operation_set_user_action_time (event->approval->operation,
- timestamp);
- empathy_dispatch_operation_approve (event->approval->operation);
+ g_assert (approval->operation != NULL);
+
+ tp_channel_dispatch_operation_handle_with_time_async (approval->operation,
+ NULL, timestamp, handle_with_time_cb, approval);
+ }
+
+ static void
+ event_channel_process_func (EventPriv *event)
+ {
+ event_manager_approval_approve (event->approval);
}
static void
if (timestamp == GDK_CURRENT_TIME)
timestamp = EMPATHY_DISPATCHER_CURRENT_TIME;
- empathy_dispatch_operation_set_user_action_time (event->approval->operation,
- timestamp);
-
if (event->approval->handler != 0)
{
- tp_chat = EMPATHY_TP_CHAT
- (empathy_dispatch_operation_get_channel_wrapper (event->approval->operation));
+ tp_chat = EMPATHY_TP_CHAT (event->approval->handler_instance);
g_signal_handler_disconnect (tp_chat, event->approval->handler);
event->approval->handler = 0;
}
- empathy_dispatch_operation_approve (event->approval->operation);
+ event_manager_approval_approve (event->approval);
}
static EventPriv *
g_signal_emit (manager, signals[EVENT_UPDATED], 0, event);
}
+ static void
+ reject_channel_claim_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+ {
+ TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_claim_finish (cdo, result, &error))
+ {
+ DEBUG ("Failed to claim channel: %s", error->message);
+
+ g_error_free (error);
+ goto out;
+ }
+
+ if (EMPATHY_IS_TP_CALL (user_data))
+ {
+ empathy_tp_call_close (user_data);
+ }
+ else if (EMPATHY_IS_TP_CHAT (user_data))
+ {
+ empathy_tp_chat_leave (user_data);
+ }
+
+ out:
+ g_object_unref (user_data);
+ }
+
+ static void
+ reject_approval (EventManagerApproval *approval)
+ {
+ /* We have to claim the channel before closing it */
+ tp_channel_dispatch_operation_claim_async (approval->operation,
+ reject_channel_claim_cb, g_object_ref (approval->handler_instance));
+ }
+
static void
event_manager_call_window_confirmation_dialog_response_cb (GtkDialog *dialog,
gint response, gpointer user_data)
if (response != GTK_RESPONSE_ACCEPT)
{
- EmpathyTpCall *call =
- EMPATHY_TP_CALL (
- empathy_dispatch_operation_get_channel_wrapper (
- approval->operation));
-
- g_object_ref (call);
- if (empathy_dispatch_operation_claim (approval->operation))
- empathy_tp_call_close (call);
- g_object_unref (call);
-
+ reject_approval (approval);
}
else
{
- EmpathyCallFactory *factory = empathy_call_factory_get ();
- empathy_call_factory_claim_channel (factory, approval->operation);
+ event_manager_approval_approve (approval);
}
}
return;
}
- call = EMPATHY_TP_CALL (empathy_dispatch_operation_get_channel_wrapper (
- event->approval->operation));
+ call = EMPATHY_TP_CALL (event->approval->handler_instance);
video = empathy_tp_call_has_initial_video (call);
static void
event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat,
- EmpathyMessage *message, EventManagerApproval *approval)
+ EmpathyMessage *message,
+ EventManagerApproval *approval)
{
EmpathyContact *sender;
const gchar *header;
channel = empathy_tp_chat_get_channel (tp_chat);
if (event != NULL)
- event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, msg);
+ event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header,
+ msg);
else
event_manager_add (approval->manager, sender, EMPATHY_EVENT_TYPE_CHAT,
EMPATHY_IMAGE_NEW_MESSAGE, header, msg, approval,
{
GQuark channel_type;
- channel_type = empathy_dispatch_operation_get_channel_type_id (
- approval->operation);
+ channel_type = tp_channel_get_channel_type_id (approval->main_channel);
+
if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
{
priv->ringing--;
}
static void
- event_manager_operation_approved_cb (EmpathyDispatchOperation *operation,
- EventManagerApproval *approval)
+ cdo_invalidated_cb (TpProxy *cdo,
+ guint domain,
+ gint code,
+ gchar *message,
+ EventManagerApproval *approval)
{
- event_manager_approval_done (approval);
- }
+ DEBUG ("ChannelDispatchOperation has been invalidated: %s", message);
- static void
- event_manager_operation_claimed_cb (EmpathyDispatchOperation *operation,
- EventManagerApproval *approval)
- {
- event_manager_approval_done (approval);
- }
-
- static void
- event_manager_operation_invalidated_cb (EmpathyDispatchOperation *operation,
- guint domain, gint code, gchar *message,
- EventManagerApproval *approval)
- {
event_manager_approval_done (approval);
}
EmpathyTpCall *call;
gboolean video;
- call = EMPATHY_TP_CALL (empathy_dispatch_operation_get_channel_wrapper (
- approval->operation));
+ call = EMPATHY_TP_CALL (approval->handler_instance);
video = empathy_tp_call_has_initial_video (call);
EventManagerApproval *approval)
{
EmpathyTpChat *tp_chat;
- gint64 timestamp;
gtk_widget_destroy (GTK_WIDGET (approval->dialog));
approval->dialog = NULL;
- tp_chat = EMPATHY_TP_CHAT (empathy_dispatch_operation_get_channel_wrapper (
- approval->operation));
+ tp_chat = EMPATHY_TP_CHAT (approval->handler_instance);
if (response != GTK_RESPONSE_OK)
{
/* close channel */
DEBUG ("Muc invitation rejected");
- if (empathy_dispatch_operation_claim (approval->operation))
- empathy_tp_chat_leave (tp_chat);
+ reject_approval (approval);
+
return;
}
DEBUG ("Muc invitation accepted");
/* We'll join the room when handling the channel */
-
- timestamp = gtk_get_current_event_time ();
- if (timestamp == GDK_CURRENT_TIME)
- timestamp = EMPATHY_DISPATCHER_CURRENT_TIME;
-
- empathy_dispatch_operation_set_user_action_time (approval->operation,
- timestamp);
- empathy_dispatch_operation_approve (approval->operation);
+ event_manager_approval_approve (approval);
}
static void
event_room_channel_process_func (EventPriv *event)
{
GtkWidget *dialog, *button, *image;
- TpChannel *channel = empathy_dispatch_operation_get_channel (
- event->approval->operation);
+ TpChannel *channel = event->approval->main_channel;
if (event->approval->dialog != NULL)
{
GObject *object)
{
EventManagerApproval *approval = (EventManagerApproval *) user_data;
- TpChannel *channel;
const gchar *invite_msg;
gchar *msg;
TpHandle self_handle;
}
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);
+ 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);
msg = g_strdup_printf (_("%s invited you to join %s"),
empathy_contact_get_name (approval->contact),
- tp_channel_get_identifier (channel));
+ tp_channel_get_identifier (approval->main_channel));
event_manager_add (approval->manager, approval->contact,
EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg,
g_free (header);
}
+ /* If there is a file-transfer or media channel consider it as the
+ * main one. */
+ static TpChannel *
+ find_main_channel (GList *channels)
+ {
+ GList *l;
+ TpChannel *text = NULL;
+
+ for (l = channels; l != NULL; l = g_list_next (l))
+ {
+ TpChannel *channel = l->data;
+ GQuark channel_type;
+
+ if (tp_proxy_get_invalidated (channel) != NULL)
+ continue;
+
+ channel_type = tp_channel_get_channel_type_id (channel);
+
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
+ channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+ return channel;
+
+ else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
+ text = channel;
+ }
+
+ return text;
+ }
+
static void
- event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
- EmpathyDispatchOperation *operation, EmpathyEventManager *manager)
+ approve_channels (TpSimpleApprover *approver,
+ TpAccount *account,
+ TpConnection *connection,
+ GList *channels,
+ TpChannelDispatchOperation *dispatch_operation,
+ TpAddDispatchOperationContext *context,
+ gpointer user_data)
{
- const gchar *channel_type;
+ EmpathyEventManager *self = user_data;
+ EmpathyEventManagerPriv *priv = GET_PRIV (self);
+ TpChannel *channel;
EventManagerApproval *approval;
- EmpathyEventManagerPriv *priv = GET_PRIV (manager);
+ GQuark channel_type;
- channel_type = empathy_dispatch_operation_get_channel_type (operation);
+ channel = find_main_channel (channels);
+ if (channel == NULL)
+ {
+ GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+ "Unknown channel type" };
- approval = event_manager_approval_new (manager, operation);
- priv->approvals = g_slist_prepend (priv->approvals, approval);
+ DEBUG ("Failed to find the main channel; ignoring");
- approval->approved_handler = g_signal_connect (operation, "approved",
- G_CALLBACK (event_manager_operation_approved_cb), approval);
+ tp_add_dispatch_operation_context_fail (context, &error);
+ return;
+ }
- approval->claimed_handler = g_signal_connect (operation, "claimed",
- G_CALLBACK (event_manager_operation_claimed_cb), approval);
+ approval = event_manager_approval_new (self, dispatch_operation, channel);
+ priv->approvals = g_slist_prepend (priv->approvals, approval);
+
+ approval->invalidated_handler = g_signal_connect (dispatch_operation,
+ "invalidated", G_CALLBACK (cdo_invalidated_cb), approval);
- approval->invalidated_handler = g_signal_connect (operation, "invalidated",
- G_CALLBACK (event_manager_operation_invalidated_cb), approval);
+ channel_type = tp_channel_get_channel_type_id (channel);
- if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT))
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
{
- EmpathyTpChat *tp_chat =
- EMPATHY_TP_CHAT (
- empathy_dispatch_operation_get_channel_wrapper (operation));
- TpChannel *channel = empathy_tp_chat_get_channel (tp_chat);
+ EmpathyTpChat *tp_chat;
+
+ tp_chat = empathy_tp_chat_new (channel);
+ approval->handler_instance = G_OBJECT (tp_chat);
if (tp_proxy_has_interface (channel, TP_IFACE_CHANNEL_INTERFACE_GROUP))
{
/* Are we in local-pending ? */
- TpHandle self_handle, inviter;
+ TpHandle inviter;
- self_handle = tp_channel_group_get_self_handle (channel);
-
- if (self_handle != 0 && tp_channel_group_get_local_pending_info (
- channel, self_handle, &inviter, NULL, NULL))
+ if (empathy_tp_chat_is_invited (tp_chat, &inviter))
{
/* We are invited to a room */
- TpConnection *connection;
-
DEBUG ("Have been invited to %s. Ask user if he wants to accept",
tp_channel_get_identifier (channel));
- connection = empathy_tp_chat_get_connection (tp_chat);
empathy_tp_contact_factory_get_from_handle (connection,
inviter, event_manager_muc_invite_got_contact_cb,
- approval, NULL, G_OBJECT (manager));
+ approval, NULL, G_OBJECT (self));
- return;
+ goto out;
}
/* 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 (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
{
EmpathyContact *contact;
- EmpathyTpCall *call = EMPATHY_TP_CALL (
- empathy_dispatch_operation_get_channel_wrapper (operation));
+ EmpathyTpCall *call = empathy_tp_call_new (channel);
+
+ approval->handler_instance = G_OBJECT (call);
g_object_get (G_OBJECT (call), "contact", &contact, NULL);
}
}
- else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
{
- TpChannel *channel;
- TpConnection *connection;
TpHandle handle;
- channel = empathy_dispatch_operation_get_channel (operation);
handle = tp_channel_get_handle (channel, NULL);
connection = tp_channel_borrow_connection (channel);
empathy_tp_contact_factory_get_from_handle (connection, handle,
- event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (manager));
+ event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (self));
}
else
{
- DEBUG ("Unknown channel type (%s), ignoring..", channel_type);
+ GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+ "Invalid channel type" };
+
+ DEBUG ("Unknown channel type (%s), ignoring..",
+ g_quark_to_string (channel_type));
+
+ tp_add_dispatch_operation_context_fail (context, &error);
+ return;
}
+
+ out:
+ tp_add_dispatch_operation_context_accept (context);
}
static void
{
TpAccount *account;
gchar *header = NULL;
- gboolean preference = FALSE;
EmpathyIdle *idle;
+ GSettings *gsettings = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA);
account = empathy_contact_get_account (contact);
idle = empathy_idle_dup_singleton ();
goto out;
if (tp_connection_presence_type_cmp_availability (previous,
- TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
{
/* contact was online */
if (tp_connection_presence_type_cmp_availability (current,
empathy_sound_play (empathy_main_window_get (),
EMPATHY_SOUND_CONTACT_DISCONNECTED);
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT, &preference);
- if (preference)
+ if (g_settings_get_boolean (gsettings,
+ EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT))
{
header = g_strdup_printf (_("%s is now offline."),
empathy_contact_get_name (contact));
else
{
/* contact was offline */
- if (preference && tp_connection_presence_type_cmp_availability (current,
- TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
+ if (tp_connection_presence_type_cmp_availability (current,
+ TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
{
/* someone is logging in */
empathy_sound_play (empathy_main_window_get (),
EMPATHY_SOUND_CONTACT_CONNECTED);
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN, &preference);
- if (preference)
+ if (g_settings_get_boolean (gsettings,
+ EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN))
{
header = g_strdup_printf (_("%s is now online."),
empathy_contact_get_name (contact));
out:
g_object_unref (idle);
+ g_object_unref (gsettings);
}
static void
g_slist_free (priv->approvals);
g_object_unref (priv->contact_manager);
g_object_unref (priv->dispatcher);
+ g_object_unref (priv->approver);
}
static void
{
EmpathyEventManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerPriv);
+ TpDBusDaemon *dbus;
+ GError *error = NULL;
manager->priv = priv;
priv->dispatcher = empathy_dispatcher_dup_singleton ();
priv->contact_manager = empathy_contact_manager_dup_singleton ();
- g_signal_connect (priv->dispatcher, "approve",
- G_CALLBACK (event_manager_approve_channel_cb), manager);
g_signal_connect (priv->contact_manager, "pendings-changed",
G_CALLBACK (event_manager_pendings_changed_cb), manager);
+
g_signal_connect (priv->contact_manager, "members-changed",
G_CALLBACK (event_manager_members_changed_cb), manager);
+
+ dbus = tp_dbus_daemon_dup (&error);
+ if (dbus == NULL)
+ {
+ DEBUG ("Failed to get TpDBusDaemon: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ priv->approver = tp_simple_approver_new (dbus, "EmpathyEventManager", FALSE,
+ approve_channels, manager, NULL);
+
+ /* Private text channels */
+ tp_base_client_take_approver_filter (priv->approver,
+ tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ NULL));
+
+ /* Muc text channels */
+ tp_base_client_take_approver_filter (priv->approver,
+ tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_ROOM,
+ NULL));
+
+ /* File transfer */
+ tp_base_client_take_approver_filter (priv->approver,
+ tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ NULL));
+
+ /* Calls */
+ tp_base_client_take_approver_filter (priv->approver,
+ tp_asv_new (
+ TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+ NULL));
+
+ if (!tp_base_client_register (priv->approver, &error))
+ {
+ DEBUG ("Failed to register Approver: %s", error->message);
+ g_error_free (error);
+ }
+
+ g_object_unref (dbus);
}
EmpathyEventManager *
#include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/interfaces.h>
-#ifdef ENABLE_TPL
#include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/log-store-empathy.h>
-#else
-#include <libempathy/empathy-log-manager.h>
-#endif /* ENABLE_TPL */
#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-dispatch-operation.h>
#include <libempathy/empathy-ft-factory.h>
+#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-tp-chat.h>
#include <libempathy/empathy-tp-call.h>
-#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-location-manager.h>
empathy_chat_window_present_chat (chat,
empathy_dispatch_operation_get_user_action_time (operation));
- if (empathy_tp_chat_is_invited (tp_chat))
+ if (empathy_tp_chat_is_invited (tp_chat, NULL))
{
/* We have been invited to the room. Add ourself as member as this
* channel has been approved. */
}
static void
-use_conn_notify_cb (EmpathyConf *conf,
+use_conn_notify_cb (GSettings *gsettings,
const gchar *key,
gpointer user_data)
{
EmpathyConnectivity *connectivity = user_data;
- gboolean use_conn;
- if (empathy_conf_get_bool (conf, key, &use_conn))
- {
- empathy_connectivity_set_use_conn (connectivity, use_conn);
- }
+ empathy_connectivity_set_use_conn (connectivity,
+ g_settings_get_boolean (gsettings, key));
}
static void
GError *error = NULL;
EmpathyIdle *idle;
EmpathyConnectivity *connectivity;
- gboolean autoconnect = TRUE;
TpConnectionPresenceType presence;
+ GSettings *gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
if (!tp_account_manager_prepare_finish (manager, result, &error))
{
presence = tp_account_manager_get_most_available_presence (manager, NULL,
NULL);
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_AUTOCONNECT, &autoconnect);
- if (autoconnect && !no_connect &&
+ if (g_settings_get_boolean (gsettings, EMPATHY_PREFS_AUTOCONNECT) &&
+ !no_connect &&
tp_connection_presence_type_cmp_availability
(presence, TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
<= 0)
g_object_unref (idle);
g_object_unref (connectivity);
+ g_object_unref (gsettings);
}
static EmpathyDispatcher *
}
static void
-empathy_idle_set_auto_away_cb (EmpathyConf *conf,
+empathy_idle_set_auto_away_cb (GSettings *gsettings,
const gchar *key,
gpointer user_data)
{
- gboolean autoaway;
EmpathyIdle *idle = user_data;
- empathy_conf_get_bool (conf, key, &autoaway);
- empathy_idle_set_auto_away (idle, autoaway);
+ empathy_idle_set_auto_away (idle,
+ g_settings_get_boolean (gsettings, key));
}
int
EmpathyStatusIcon *icon;
EmpathyDispatcher *dispatcher;
TpAccountManager *account_manager;
-#ifdef ENABLE_TPL
TplLogManager *log_manager;
-#else
- EmpathyLogManager *log_manager;
-#endif /* ENABLE_TPL */
EmpathyChatroomManager *chatroom_manager;
EmpathyCallFactory *call_factory;
EmpathyFTFactory *ft_factory;
#ifdef ENABLE_DEBUG
TpDebugSender *debug_sender;
#endif
+ GSettings *gsettings;
GOptionContext *optcontext;
GOptionEntry options[] = {
/* Setting up Idle */
idle = empathy_idle_dup_singleton ();
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_AUTOAWAY, &autoaway);
+ gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
+ autoaway = g_settings_get_boolean (gsettings, EMPATHY_PREFS_AUTOAWAY);
- empathy_conf_notify_add (empathy_conf_get (),
- EMPATHY_PREFS_AUTOAWAY,
- empathy_idle_set_auto_away_cb,
- idle);
+ g_signal_connect (gsettings,
+ "changed::" EMPATHY_PREFS_AUTOAWAY,
+ G_CALLBACK (empathy_idle_set_auto_away_cb), idle);
empathy_idle_set_auto_away (idle, autoaway);
/* Setting up Connectivity */
connectivity = empathy_connectivity_dup_singleton ();
- use_conn_notify_cb (empathy_conf_get (), EMPATHY_PREFS_USE_CONN,
+ use_conn_notify_cb (gsettings, EMPATHY_PREFS_USE_CONN,
connectivity);
- empathy_conf_notify_add (empathy_conf_get (), EMPATHY_PREFS_USE_CONN,
- use_conn_notify_cb, connectivity);
+ g_signal_connect (gsettings,
+ "changed::" EMPATHY_PREFS_USE_CONN,
+ G_CALLBACK (use_conn_notify_cb), connectivity);
/* account management */
account_manager = tp_account_manager_dup ();
G_CALLBACK (unique_app_message_cb), window);
/* Logging */
-#ifdef ENABLE_TPL
log_manager = tpl_log_manager_dup_singleton ();
-#else
- log_manager = empathy_log_manager_dup_singleton ();
- empathy_log_manager_observe (log_manager, dispatcher);
-#endif
chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
#endif
g_object_unref (ft_factory);
g_object_unref (unique_app);
+ g_object_unref (gsettings);
notify_uninit ();
xmlCleanupParser ();
projects / empathy.git / commitdiff