[empathy] stop handling text channels using EmpathyDispatcher
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] stop handling text channels using EmpathyDispatcher
- Date: Mon, 5 Jul 2010 08:14:10 +0000 (UTC)
commit 9be71372f5579a2517231f1c5c2733610a550975
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Jul 2 12:00:46 2010 +0200
stop handling text channels using EmpathyDispatcher
libempathy/empathy-dispatch-operation.c | 40 +------------------------------
src/empathy.c | 22 +----------------
2 files changed, 2 insertions(+), 60 deletions(-)
---
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index 65fe4b1..e59d697 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -27,7 +27,6 @@
#include "empathy-dispatch-operation.h"
#include <libempathy/empathy-enum-types.h>
#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-tp-chat.h>
#include <libempathy/empathy-tp-call.h>
#include <libempathy/empathy-tp-file.h>
@@ -417,31 +416,6 @@ empathy_dispatch_operation_set_status (EmpathyDispatchOperation *self,
}
static void
-channel_wrapper_ready (EmpathyDispatchOperation *self)
-{
- EmpathyDispatchOperationPriv *priv = GET_PRIV (self);
-
- g_signal_handler_disconnect (priv->channel_wrapper, priv->ready_handler);
- priv->ready_handler = 0;
-
- empathy_dispatch_operation_set_status (self,
- EMPATHY_DISPATCHER_OPERATION_STATE_PENDING);
-}
-
-static void
-empathy_dispatcher_operation_tp_chat_ready_cb (GObject *object,
- GParamSpec *spec, gpointer user_data)
-{
- EmpathyDispatchOperation *self = EMPATHY_DISPATCH_OPERATION (user_data);
- EmpathyDispatchOperationPriv *priv = GET_PRIV (self);
-
- if (!empathy_tp_chat_is_ready (EMPATHY_TP_CHAT (priv->channel_wrapper)))
- return;
-
- channel_wrapper_ready (self);
-}
-
-static void
empathy_dispatch_operation_channel_ready_cb (TpChannel *channel,
const GError *error, gpointer user_data)
{
@@ -465,19 +439,7 @@ empathy_dispatch_operation_channel_ready_cb (TpChannel *channel,
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
- {
- EmpathyTpChat *chat= empathy_tp_chat_new (channel);
- priv->channel_wrapper = G_OBJECT (chat);
-
- if (!empathy_tp_chat_is_ready (chat))
- {
- priv->ready_handler = g_signal_connect (chat, "notify::ready",
- G_CALLBACK (empathy_dispatcher_operation_tp_chat_ready_cb), self);
- goto out;
- }
- }
- else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
{
EmpathyTpFile *file = empathy_tp_file_new (channel, priv->incoming);
priv->channel_wrapper = G_OBJECT (file);
diff --git a/src/empathy.c b/src/empathy.c
index 332fd50..7b7aa1a 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -364,31 +364,12 @@ setup_dispatcher (void)
const gchar *channeltype;
TpHandleType handletype;
} types[] = {
- /* Text channels with handle types none, contact and room */
- { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_NONE },
- { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_CONTACT },
- { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM },
/* file transfer to contacts */
{ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT },
};
GHashTable *asv;
guint i;
- /* Setup the basic Client.Handler that matches our client filter */
- filters = g_ptr_array_new ();
- asv = tp_asv_new (
- TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_TEXT,
- TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_INT,
- TP_HANDLE_TYPE_CONTACT,
- NULL);
- g_ptr_array_add (filters, asv);
-
- d = empathy_dispatcher_new (PACKAGE_NAME, filters, NULL);
-
- g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL);
- g_ptr_array_free (filters, TRUE);
-
/* Setup the an extended Client.Handler that matches everything we can do */
filters = g_ptr_array_new ();
for (i = 0 ; i < G_N_ELEMENTS (types); i++)
@@ -401,8 +382,7 @@ setup_dispatcher (void)
g_ptr_array_add (filters, asv);
}
- empathy_dispatcher_add_handler (d, PACKAGE_NAME"MoreThanMeetsTheEye",
- filters, NULL);
+ d = empathy_dispatcher_new (PACKAGE_NAME"MoreThanMeetsTheEye", filters, NULL);
g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL);
g_ptr_array_free (filters, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]