aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-03-30 18:37:25 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-03-30 18:37:25 +0800
commit940d0e9778828657a6ffbcadd35a8a84d706ac70 (patch)
treeb163e0eea34c115edbd5e72eb56de944352721e7 /libempathy
parente7f70475f0533c310995a9dc3b2f5ee1eb58b618 (diff)
parentfff76809babe6a154cd548e9bc3aa43199e9eda9 (diff)
downloadgsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.gz
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.bz2
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.lz
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.xz
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.tar.zst
gsoc2013-empathy-940d0e9778828657a6ffbcadd35a8a84d706ac70.zip
Merge branch 'people-nearby-fake-group-613558'
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-contact-list.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 9288baa4c..95ec3bea2 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -43,7 +43,6 @@
typedef struct {
EmpathyTpContactFactory *factory;
TpConnection *connection;
- const gchar *protocol_group;
TpChannel *publish;
TpChannel *subscribe;
@@ -860,7 +859,6 @@ static void
tp_contact_list_constructed (GObject *list)
{
EmpathyTpContactListPriv *priv = GET_PRIV (list);
- gchar *protocol_name = NULL;
priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection);
@@ -902,15 +900,6 @@ tp_contact_list_constructed (GObject *list)
tp_contact_list_new_channel_cb,
NULL, NULL,
list, NULL);
-
- /* Check for protocols that does not support contact groups. We can
- * put all contacts into a special group in that case.
- * FIXME: Default group should be an information in the profile */
- tp_connection_parse_object_path (priv->connection, &protocol_name, NULL);
- if (!tp_strdiff (protocol_name, "local-xmpp")) {
- priv->protocol_group = _("People nearby");
- }
- g_free (protocol_name);
}
static void
@@ -1112,10 +1101,6 @@ tp_contact_list_get_all_groups (EmpathyContactList *list)
l->data = g_strdup (l->data);
}
- if (priv->protocol_group) {
- ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
- }
-
return ret;
}
@@ -1141,10 +1126,6 @@ tp_contact_list_get_groups (EmpathyContactList *list,
}
}
- if (priv->protocol_group) {
- ret = g_list_prepend (ret, g_strdup (priv->protocol_group));
- }
-
return ret;
}