aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-02 18:00:46 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-07-05 16:13:52 +0800
commit9be71372f5579a2517231f1c5c2733610a550975 (patch)
tree83a8c7f2d719e326d26e670d9af448f144c98b31 /src
parentf965c339f09e993d4d02567b93e09646b3d6f627 (diff)
downloadgsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar.gz
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar.bz2
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar.lz
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar.xz
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.tar.zst
gsoc2013-empathy-9be71372f5579a2517231f1c5c2733610a550975.zip
stop handling text channels using EmpathyDispatcher
Diffstat (limited to 'src')
-rw-r--r--src/empathy.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 332fd5033..7b7aa1a93 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);