/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2008 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include <glib.h>
#include <gtk/gtk.h>
-#include <libempathy/empathy-debug.h>
+#include <telepathy-glib/util.h>
+#include <libempathy/empathy-utils.h>
#include "empathy-contact-list-store.h"
-#include "empathy-contact-groups.h"
#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
-#define DEBUG_DOMAIN "ContactListStore"
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include <libempathy/empathy-debug.h>
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
*/
-/* Time user is shown as active */
-#define ACTIVE_USER_SHOW_TIME 7000
-
-/* Time after connecting which we wait before active users are enabled */
-#define ACTIVE_USER_WAIT_TO_ENABLE_TIME 5000
+/* Time in seconds user is shown as active */
+#define ACTIVE_USER_SHOW_TIME 7
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStorePriv))
+/* Time in seconds after connecting which we wait before active users are enabled */
+#define ACTIVE_USER_WAIT_TO_ENABLE_TIME 5
-struct _EmpathyContactListStorePriv {
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactListStore)
+typedef struct {
EmpathyContactList *list;
gboolean show_offline;
gboolean show_avatars;
+ gboolean show_groups;
gboolean is_compact;
gboolean show_active;
EmpathyContactListStoreSort sort_criterium;
guint inhibit_active;
-
- EmpathyContactGroupsFunc get_contact_groups;
- gpointer get_contact_groups_data;
-};
+} EmpathyContactListStorePriv;
typedef struct {
GtkTreeIter iter;
gboolean remove;
} ShowActiveData;
-static void empathy_contact_list_store_class_init (EmpathyContactListStoreClass *klass);
-static void empathy_contact_list_store_init (EmpathyContactListStore *list);
static void contact_list_store_finalize (GObject *object);
static void contact_list_store_get_property (GObject *object,
guint param_id,
guint param_id,
const GValue *value,
GParamSpec *pspec);
-static gboolean contact_list_store_finalize_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer user_data);
static void contact_list_store_setup (EmpathyContactListStore *store);
static gboolean contact_list_store_inibit_active_cb (EmpathyContactListStore *store);
static void contact_list_store_members_changed_cb (EmpathyContactList *list_iface,
enum {
PROP_0,
+ PROP_CONTACT_LIST,
PROP_SHOW_OFFLINE,
PROP_SHOW_AVATARS,
+ PROP_SHOW_GROUPS,
PROP_IS_COMPACT,
PROP_SORT_CRITERIUM
};
G_DEFINE_TYPE (EmpathyContactListStore, empathy_contact_list_store, GTK_TYPE_TREE_STORE);
+static gboolean
+contact_list_store_iface_setup (gpointer user_data)
+{
+ EmpathyContactListStore *store = user_data;
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
+ GList *contacts, *l;
+
+ /* Signal connection. */
+ g_signal_connect (priv->list,
+ "members-changed",
+ G_CALLBACK (contact_list_store_members_changed_cb),
+ store);
+ g_signal_connect (priv->list,
+ "groups-changed",
+ G_CALLBACK (contact_list_store_groups_changed_cb),
+ store);
+
+ /* Add contacts already created. */
+ contacts = empathy_contact_list_get_members (priv->list);
+ for (l = contacts; l; l = l->next) {
+ contact_list_store_members_changed_cb (priv->list, l->data,
+ NULL, 0, NULL,
+ TRUE,
+ store);
+
+ g_object_unref (l->data);
+ }
+ g_list_free (contacts);
+
+ return FALSE;
+}
+
+
+static void
+contact_list_store_set_contact_list (EmpathyContactListStore *store,
+ EmpathyContactList *list_iface)
+{
+ EmpathyContactListStorePriv *priv = GET_PRIV (store);
+
+ priv->list = g_object_ref (list_iface);
+
+ /* Let a chance to have all properties set before populating */
+ g_idle_add (contact_list_store_iface_setup, store);
+}
+
static void
empathy_contact_list_store_class_init (EmpathyContactListStoreClass *klass)
{
object_class->get_property = contact_list_store_get_property;
object_class->set_property = contact_list_store_set_property;
+ g_object_class_install_property (object_class,
+ PROP_CONTACT_LIST,
+ g_param_spec_object ("contact-list",
+ "The contact list iface",
+ "The contact list iface",
+ EMPATHY_TYPE_CONTACT_LIST,
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_SHOW_OFFLINE,
g_param_spec_boolean ("show-offline",
"avatars for contacts",
TRUE,
G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_SHOW_GROUPS,
+ g_param_spec_boolean ("show-groups",
+ "Show Groups",
+ "Whether contact list should display "
+ "contact groups",
+ TRUE,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_IS_COMPACT,
g_param_spec_boolean ("is-compact",
static void
empathy_contact_list_store_init (EmpathyContactListStore *store)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (store);
+ EmpathyContactListStorePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (store,
+ EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStorePriv);
+ store->priv = priv;
priv->show_avatars = TRUE;
- priv->inhibit_active = g_timeout_add (ACTIVE_USER_WAIT_TO_ENABLE_TIME,
- (GSourceFunc) contact_list_store_inibit_active_cb,
- store);
+ priv->show_groups = TRUE;
+ priv->inhibit_active = g_timeout_add_seconds (ACTIVE_USER_WAIT_TO_ENABLE_TIME,
+ (GSourceFunc) contact_list_store_inibit_active_cb,
+ store);
+ contact_list_store_setup (store);
}
static void
contact_list_store_finalize (GObject *object)
{
- EmpathyContactListStorePriv *priv;
-
- priv = GET_PRIV (object);
-
- gtk_tree_model_foreach (GTK_TREE_MODEL (object),
- (GtkTreeModelForeachFunc) contact_list_store_finalize_foreach,
- object);
+ EmpathyContactListStorePriv *priv = GET_PRIV (object);
+ GList *contacts, *l;
- if (priv->list) {
- g_signal_handlers_disconnect_by_func (priv->list,
- G_CALLBACK (contact_list_store_members_changed_cb),
- object);
- g_signal_handlers_disconnect_by_func (priv->list,
- G_CALLBACK (contact_list_store_groups_changed_cb),
+ contacts = empathy_contact_list_get_members (priv->list);
+ for (l = contacts; l; l = l->next) {
+ g_signal_handlers_disconnect_by_func (l->data,
+ G_CALLBACK (contact_list_store_contact_updated_cb),
object);
- g_object_unref (priv->list);
+
+ g_object_unref (l->data);
}
+ g_list_free (contacts);
+
+ g_signal_handlers_disconnect_by_func (priv->list,
+ G_CALLBACK (contact_list_store_members_changed_cb),
+ object);
+ g_signal_handlers_disconnect_by_func (priv->list,
+ G_CALLBACK (contact_list_store_groups_changed_cb),
+ object);
+ g_object_unref (priv->list);
if (priv->inhibit_active) {
g_source_remove (priv->inhibit_active);
priv = GET_PRIV (object);
switch (param_id) {
+ case PROP_CONTACT_LIST:
+ g_value_set_object (value, priv->list);
+ break;
case PROP_SHOW_OFFLINE:
g_value_set_boolean (value, priv->show_offline);
break;
case PROP_SHOW_AVATARS:
g_value_set_boolean (value, priv->show_avatars);
break;
+ case PROP_SHOW_GROUPS:
+ g_value_set_boolean (value, priv->show_groups);
+ break;
case PROP_IS_COMPACT:
g_value_set_boolean (value, priv->is_compact);
break;
priv = GET_PRIV (object);
switch (param_id) {
+ case PROP_CONTACT_LIST:
+ contact_list_store_set_contact_list (EMPATHY_CONTACT_LIST_STORE (object),
+ g_value_get_object (value));
+ break;
case PROP_SHOW_OFFLINE:
empathy_contact_list_store_set_show_offline (EMPATHY_CONTACT_LIST_STORE (object),
g_value_get_boolean (value));
empathy_contact_list_store_set_show_avatars (EMPATHY_CONTACT_LIST_STORE (object),
g_value_get_boolean (value));
break;
+ case PROP_SHOW_GROUPS:
+ empathy_contact_list_store_set_show_groups (EMPATHY_CONTACT_LIST_STORE (object),
+ g_value_get_boolean (value));
+ break;
case PROP_IS_COMPACT:
empathy_contact_list_store_set_is_compact (EMPATHY_CONTACT_LIST_STORE (object),
g_value_get_boolean (value));
EmpathyContactListStore *
empathy_contact_list_store_new (EmpathyContactList *list_iface)
{
- EmpathyContactListStore *store;
- EmpathyContactListStorePriv *priv;
- GList *contacts, *l;
-
g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list_iface), NULL);
- store = g_object_new (EMPATHY_TYPE_CONTACT_LIST_STORE, NULL);
- priv = GET_PRIV (store);
-
- contact_list_store_setup (store);
- priv->list = g_object_ref (list_iface);
-
- /* Signal connection. */
- g_signal_connect (priv->list,
- "members-changed",
- G_CALLBACK (contact_list_store_members_changed_cb),
- store);
- g_signal_connect (priv->list,
- "groups-changed",
- G_CALLBACK (contact_list_store_groups_changed_cb),
- store);
-
- /* Add contacts already created. */
- contacts = empathy_contact_list_get_members (priv->list);
- for (l = contacts; l; l = l->next) {
- contact_list_store_members_changed_cb (priv->list, l->data,
- NULL, 0, NULL,
- TRUE,
- store);
-
- g_object_unref (l->data);
- }
- g_list_free (contacts);
-
- return store;
+ return g_object_new (EMPATHY_TYPE_CONTACT_LIST_STORE,
+ "contact-list", list_iface,
+ NULL);
}
EmpathyContactList *
/* Restore to original setting. */
priv->show_active = show_active;
+
+ g_object_notify (G_OBJECT (store), "show-offline");
}
gboolean
(GtkTreeModelForeachFunc)
contact_list_store_update_list_mode_foreach,
store);
+
+ g_object_notify (G_OBJECT (store), "show-avatars");
+}
+
+gboolean
+empathy_contact_list_store_get_show_groups (EmpathyContactListStore *store)
+{
+ EmpathyContactListStorePriv *priv;
+
+ g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
+
+ priv = GET_PRIV (store);
+
+ return priv->show_groups;
+}
+
+void
+empathy_contact_list_store_set_show_groups (EmpathyContactListStore *store,
+ gboolean show_groups)
+{
+ EmpathyContactListStorePriv *priv;
+ GList *contacts, *l;
+
+ g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
+
+ priv = GET_PRIV (store);
+
+ if (priv->show_groups == show_groups) {
+ return;
+ }
+
+ priv->show_groups = show_groups;
+
+ /* Remove all contacts and add them back, not optimized but that's the
+ * easy way :) */
+ gtk_tree_store_clear (GTK_TREE_STORE (store));
+ contacts = empathy_contact_list_get_members (priv->list);
+ for (l = contacts; l; l = l->next) {
+ contact_list_store_members_changed_cb (priv->list, l->data,
+ NULL, 0, NULL,
+ TRUE,
+ store);
+
+ g_object_unref (l->data);
+ }
+ g_list_free (contacts);
+
+ g_object_notify (G_OBJECT (store), "show-groups");
}
gboolean
(GtkTreeModelForeachFunc)
contact_list_store_update_list_mode_foreach,
store);
+
+ g_object_notify (G_OBJECT (store), "is-compact");
}
EmpathyContactListStoreSort
switch (sort_criterium) {
case EMPATHY_CONTACT_LIST_STORE_SORT_STATE:
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
- COL_STATUS,
+ EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
GTK_SORT_ASCENDING);
break;
case EMPATHY_CONTACT_LIST_STORE_SORT_NAME:
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
- COL_NAME,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME,
GTK_SORT_ASCENDING);
break;
}
+
+ g_object_notify (G_OBJECT (store), "sort-criterium");
}
gboolean
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
gtk_tree_model_get (model, iter,
- COL_IS_SEPARATOR, &is_separator,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-1);
return is_separator;
}
gtk_tree_model_get (model, &iter,
- COL_IS_GROUP, &is_group,
- COL_NAME, &name,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-1);
if (!is_group) {
iter = parent_iter;
gtk_tree_model_get (model, &iter,
- COL_IS_GROUP, &is_group,
- COL_NAME, &name,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-1);
if (!is_group) {
g_free (name);
return TRUE;
}
- gtk_tree_model_get (model, iter, COL_NAME, &name, -1);
+ gtk_tree_model_get (model, iter,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+ -1);
if (!name) {
return TRUE;
return ret;
}
-static gboolean
-contact_list_store_finalize_foreach (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer user_data)
-{
- EmpathyContactListStore *store = user_data;
- EmpathyContact *contact = NULL;
-
- gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
- COL_CONTACT, &contact,
- -1);
-
- if (contact) {
- g_signal_handlers_disconnect_by_func (contact,
- G_CALLBACK (contact_list_store_contact_updated_cb),
- store);
- }
-
- return FALSE;
-}
-
static void
contact_list_store_setup (EmpathyContactListStore *store)
{
priv = GET_PRIV (store);
- gtk_tree_store_set_column_types (GTK_TREE_STORE (store), COL_COUNT, types);
+ gtk_tree_store_set_column_types (GTK_TREE_STORE (store),
+ EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
+ types);
/* Set up sorting */
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
- COL_NAME,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME,
contact_list_store_name_sort_func,
store, NULL);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
- COL_STATUS,
+ EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
contact_list_store_state_sort_func,
store, NULL);
priv = GET_PRIV (store);
- empathy_debug (DEBUG_DOMAIN,
- "Contact %s (%d) %s",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact),
- is_member ? "added" : "removed");
+ DEBUG ("Contact %s (%d) %s",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact),
+ is_member ? "added" : "removed");
if (is_member) {
g_signal_connect (contact, "notify::presence",
G_CALLBACK (contact_list_store_contact_updated_cb),
store);
+ g_signal_connect (contact, "notify::presence-message",
+ G_CALLBACK (contact_list_store_contact_updated_cb),
+ store);
g_signal_connect (contact, "notify::name",
G_CALLBACK (contact_list_store_contact_updated_cb),
store);
priv = GET_PRIV (store);
- empathy_debug (DEBUG_DOMAIN, "Updating groups for contact %s (%d)",
- empathy_contact_get_id (contact),
- empathy_contact_get_handle (contact));
+ DEBUG ("Updating groups for contact %s (%d)",
+ empathy_contact_get_id (contact),
+ empathy_contact_get_handle (contact));
/* We do this to make sure the groups are correct, if not, we
* would have to check the groups already set up for each
{
EmpathyContactListStorePriv *priv;
GtkTreeIter iter;
- GList *groups, *l;
+ GList *groups = NULL, *l;
priv = GET_PRIV (store);
- if (!priv->show_offline && !empathy_contact_is_online (contact)) {
+ if (EMP_STR_EMPTY (empathy_contact_get_name (contact)) ||
+ (!priv->show_offline && !empathy_contact_is_online (contact))) {
return;
}
- groups = empathy_contact_list_get_groups (priv->list, contact);
+ if (priv->show_groups) {
+ groups = empathy_contact_list_get_groups (priv->list, contact);
+ }
/* If no groups just add it at the top level. */
if (!groups) {
gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
- COL_NAME, empathy_contact_get_name (contact),
- COL_CONTACT, contact,
- COL_IS_GROUP, FALSE,
- COL_IS_SEPARATOR, FALSE,
- COL_CAN_VOIP, empathy_contact_can_voip (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_CAN_VOIP, empathy_contact_can_voip (contact),
-1);
}
gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
&iter_group, NULL);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
- COL_NAME, empathy_contact_get_name (contact),
- COL_CONTACT, contact,
- COL_IS_GROUP, FALSE,
- COL_IS_SEPARATOR, FALSE,
- COL_CAN_VOIP, empathy_contact_can_voip (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_CAN_VOIP, empathy_contact_can_voip (contact),
-1);
g_free (l->data);
}
gboolean do_remove = FALSE;
gboolean do_set_active = FALSE;
gboolean do_set_refresh = FALSE;
+ gboolean show_avatar = FALSE;
GdkPixbuf *pixbuf_avatar;
priv = GET_PRIV (store);
if (!in_list && !should_be_in_list) {
/* Nothing to do. */
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' in list:NO, should be:NO",
- empathy_contact_get_name (contact));
+ DEBUG ("Contact:'%s' in list:NO, should be:NO",
+ empathy_contact_get_name (contact));
g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
g_list_free (iters);
return;
}
else if (in_list && !should_be_in_list) {
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' in list:YES, should be:NO",
- empathy_contact_get_name (contact));
+ DEBUG ("Contact:'%s' in list:YES, should be:NO",
+ empathy_contact_get_name (contact));
if (priv->show_active) {
do_remove = TRUE;
do_set_refresh = TRUE;
set_model = TRUE;
- empathy_debug (DEBUG_DOMAIN, "Remove item (after timeout)");
+ DEBUG ("Remove item (after timeout)");
} else {
- empathy_debug (DEBUG_DOMAIN, "Remove item (now)!");
+ DEBUG ("Remove item (now)!");
contact_list_store_remove_contact (store, contact);
}
}
else if (!in_list && should_be_in_list) {
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' in list:NO, should be:YES",
- empathy_contact_get_name (contact));
+ DEBUG ("Contact:'%s' in list:NO, should be:YES",
+ empathy_contact_get_name (contact));
contact_list_store_add_contact (store, contact);
if (priv->show_active) {
do_set_active = TRUE;
- empathy_debug (DEBUG_DOMAIN, "Set active (contact added)");
+ DEBUG ("Set active (contact added)");
}
} else {
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' in list:YES, should be:YES",
- empathy_contact_get_name (contact));
+ DEBUG ("Contact:'%s' in list:YES, should be:YES",
+ empathy_contact_get_name (contact));
/* Get online state before. */
if (iters && g_list_length (iters) > 0) {
gtk_tree_model_get (model, iters->data,
- COL_IS_ONLINE, &was_online,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, &was_online,
-1);
}
do_set_active = TRUE;
do_set_refresh = TRUE;
- empathy_debug (DEBUG_DOMAIN, "Set active (contact updated %s)",
- was_online ? "online -> offline" :
- "offline -> online");
+ DEBUG ("Set active (contact updated %s)",
+ was_online ? "online -> offline" :
+ "offline -> online");
} else {
/* Was TRUE for presence updates. */
/* do_set_active = FALSE; */
do_set_refresh = TRUE;
- empathy_debug (DEBUG_DOMAIN, "Set active (contact updated)");
+ DEBUG ("Set active (contact updated)");
}
}
set_model = TRUE;
}
+ if (priv->show_avatars && !priv->is_compact) {
+ show_avatar = TRUE;
+ }
pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
for (l = iters; l && set_model; l = l->next) {
gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
- COL_ICON_STATUS, empathy_icon_name_for_contact (contact),
- COL_PIXBUF_AVATAR, pixbuf_avatar,
- COL_PIXBUF_AVATAR_VISIBLE, priv->show_avatars,
- COL_NAME, empathy_contact_get_name (contact),
- COL_STATUS, empathy_contact_get_status (contact),
- COL_STATUS_VISIBLE, !priv->is_compact,
- COL_IS_GROUP, FALSE,
- COL_IS_ONLINE, now_online,
- COL_IS_SEPARATOR, FALSE,
- COL_CAN_VOIP, empathy_contact_can_voip (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, empathy_icon_name_for_contact (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
+ EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_STATUS, empathy_contact_get_status (contact),
+ EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, now_online,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_CAN_VOIP, empathy_contact_can_voip (contact),
-1);
}
if (do_set_active) {
data = contact_list_store_contact_active_new (store, contact, do_remove);
- g_timeout_add (ACTIVE_USER_SHOW_TIME,
- (GSourceFunc) contact_list_store_contact_active_cb,
- data);
+ g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
+ (GSourceFunc) contact_list_store_contact_active_cb,
+ data);
}
}
GParamSpec *param,
EmpathyContactListStore *store)
{
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' updated, checking roster is in sync...",
- empathy_contact_get_name (contact));
+ DEBUG ("Contact:'%s' updated, checking roster is in sync...",
+ empathy_contact_get_name (contact));
contact_list_store_contact_update (store, contact);
}
GtkTreePath *path;
gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
- COL_IS_ACTIVE, active,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, active,
-1);
- empathy_debug (DEBUG_DOMAIN, "Set item %s", active ? "active" : "inactive");
+ DEBUG ("Set item %s", active ? "active" : "inactive");
if (set_changed) {
path = gtk_tree_model_get_path (model, l->data);
{
ShowActiveData *data;
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' now active, and %s be removed",
- empathy_contact_get_name (contact),
- remove ? "WILL" : "WILL NOT");
+ DEBUG ("Contact:'%s' now active, and %s be removed",
+ empathy_contact_get_name (contact),
+ remove ? "WILL" : "WILL NOT");
data = g_slice_new0 (ShowActiveData);
if (data->remove &&
!priv->show_offline &&
!empathy_contact_is_online (data->contact)) {
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' active timeout, removing item",
- empathy_contact_get_name (data->contact));
+ DEBUG ("Contact:'%s' active timeout, removing item",
+ empathy_contact_get_name (data->contact));
contact_list_store_remove_contact (data->store, data->contact);
}
- empathy_debug (DEBUG_DOMAIN,
- "Contact:'%s' no longer active",
- empathy_contact_get_name (data->contact));
+ DEBUG ("Contact:'%s' no longer active",
+ empathy_contact_get_name (data->contact));
contact_list_store_contact_set_active (data->store,
data->contact,
}
gtk_tree_model_get (model, iter,
- COL_NAME, &str,
- COL_IS_GROUP, &is_group,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &str,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-1);
- if (is_group && strcmp (str, fg->name) == 0) {
+ if (is_group && !tp_strdiff (str, fg->name)) {
fg->found = TRUE;
fg->iter = *iter;
}
gtk_tree_store_append (GTK_TREE_STORE (store), &iter_group, NULL);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter_group,
- COL_ICON_STATUS, NULL,
- COL_NAME, name,
- COL_IS_GROUP, TRUE,
- COL_IS_ACTIVE, FALSE,
- COL_IS_SEPARATOR, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, NULL,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, name,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, TRUE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, FALSE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-1);
if (iter_group_to_set) {
&iter_separator,
&iter_group);
gtk_tree_store_set (GTK_TREE_STORE (store), &iter_separator,
- COL_IS_SEPARATOR, TRUE,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, TRUE,
-1);
if (iter_separator_to_set) {
gboolean is_separator;
gtk_tree_model_get (model, &iter_separator,
- COL_IS_SEPARATOR, &is_separator,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-1);
if (is_separator && iter_separator_to_set) {
}
}
+static guint
+contact_list_store_ordered_presence (McPresence state)
+{
+ switch (state) {
+ case MC_PRESENCE_UNSET:
+ case MC_PRESENCE_OFFLINE:
+ return 5;
+ case MC_PRESENCE_AVAILABLE:
+ return 0;
+ case MC_PRESENCE_AWAY:
+ return 2;
+ case MC_PRESENCE_EXTENDED_AWAY:
+ return 3;
+ case MC_PRESENCE_HIDDEN:
+ return 4;
+ case MC_PRESENCE_DO_NOT_DISTURB:
+ return 1;
+ default:
+ g_return_val_if_reached (6);
+ }
+}
+
static gint
contact_list_store_state_sort_func (GtkTreeModel *model,
GtkTreeIter *iter_a,
gint ret_val = 0;
gchar *name_a, *name_b;
gboolean is_separator_a, is_separator_b;
- EmpathyContact *contact_a, *contact_b;
- EmpathyPresence *presence_a, *presence_b;
- McPresence state_a, state_b;
+ EmpathyContact *contact_a, *contact_b;
+ guint presence_a, presence_b;
gtk_tree_model_get (model, iter_a,
- COL_NAME, &name_a,
- COL_CONTACT, &contact_a,
- COL_IS_SEPARATOR, &is_separator_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
-1);
gtk_tree_model_get (model, iter_b,
- COL_NAME, &name_b,
- COL_CONTACT, &contact_b,
- COL_IS_SEPARATOR, &is_separator_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
-1);
/* Separator or group? */
* the presences.
*/
presence_a = empathy_contact_get_presence (EMPATHY_CONTACT (contact_a));
+ presence_a = contact_list_store_ordered_presence (presence_a);
presence_b = empathy_contact_get_presence (EMPATHY_CONTACT (contact_b));
+ presence_b = contact_list_store_ordered_presence (presence_b);
- if (!presence_a && presence_b) {
- ret_val = 1;
- } else if (presence_a && !presence_b) {
+ if (presence_a < presence_b) {
ret_val = -1;
- } else if (!presence_a && !presence_b) {
- /* Both offline, sort by name */
- ret_val = g_utf8_collate (name_a, name_b);
+ } else if (presence_a > presence_b) {
+ ret_val = 1;
} else {
- state_a = empathy_presence_get_state (presence_a);
- state_b = empathy_presence_get_state (presence_b);
-
- if (state_a < state_b) {
- ret_val = -1;
- } else if (state_a > state_b) {
- ret_val = 1;
- } else {
- /* Fallback: compare by name */
- ret_val = g_utf8_collate (name_a, name_b);
- }
+ /* Fallback: compare by name */
+ ret_val = g_utf8_collate (name_a, name_b);
}
free_and_out:
gint ret_val;
gtk_tree_model_get (model, iter_a,
- COL_NAME, &name_a,
- COL_CONTACT, &contact_a,
- COL_IS_SEPARATOR, &is_separator_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
-1);
gtk_tree_model_get (model, iter_b,
- COL_NAME, &name_b,
- COL_CONTACT, &contact_b,
- COL_IS_SEPARATOR, &is_separator_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
+ EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
-1);
/* If contact is NULL it means it's a group. */
EmpathyContact *contact;
gtk_tree_model_get (model, iter,
- COL_CONTACT, &contact,
+ EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-1);
- if (!contact) {
- return FALSE;
- }
-
- if (empathy_contact_equal (contact, fc->contact)) {
+ if (contact == fc->contact) {
fc->found = TRUE;
fc->iters = g_list_append (fc->iters, gtk_tree_iter_copy (iter));
}
- g_object_unref (contact);
+
+ if (contact) {
+ g_object_unref (contact);
+ }
return FALSE;
}
}
gtk_tree_store_set (GTK_TREE_STORE (store), iter,
- COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
- COL_STATUS_VISIBLE, !priv->is_compact,
+ EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
+ EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact,
-1);
return FALSE;
projects / empathy.git / blobdiff