*/
#include "config.h"
-
-#include <string.h>
+#include "empathy-individual-view.h"
#include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
-#include "empathy-individual-view.h"
-#include "empathy-individual-menu.h"
-#include "empathy-individual-store.h"
-#include "empathy-contact-dialogs.h"
-#include "empathy-individual-dialogs.h"
-#include "empathy-images.h"
-#include "empathy-linking-dialog.h"
+#include "empathy-cell-renderer-activatable.h"
#include "empathy-cell-renderer-expander.h"
#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-contact-groups.h"
#include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
+#include "empathy-images.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
gboolean show_offline;
gboolean show_untrusted;
+ gboolean show_uninteresting;
GtkTreeModelFilter *filter;
GtkWidget *search_widget;
GtkTreeModelFilterVisibleFunc custom_filter;
gpointer custom_filter_data;
+
+ GtkCellRenderer *text_renderer;
} EmpathyIndividualViewPriv;
typedef struct
PROP_INDIVIDUAL_FEATURES,
PROP_SHOW_OFFLINE,
PROP_SHOW_UNTRUSTED,
+ PROP_SHOW_UNINTERESTING,
};
/* TODO: re-add DRAG_TYPE_CONTACT_ID, for the case that we're dragging around
{ (gchar *) T, 0, I }
static const GtkTargetEntry drag_types_dest[] = {
- DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
- DRAG_TYPE ("text/persona-id", DND_DRAG_TYPE_PERSONA_ID),
+ DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
+ DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID),
DRAG_TYPE ("text/path-list", DND_DRAG_TYPE_URI_LIST),
DRAG_TYPE ("text/uri-list", DND_DRAG_TYPE_URI_LIST),
DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING),
};
static const GtkTargetEntry drag_types_source[] = {
- DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
+ DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
};
#undef DRAG_TYPE
EMPATHY_INDIVIDUAL_WIDGET_SHOW_CLIENT_TYPES);
gtk_container_set_border_width (GTK_CONTAINER (priv->tooltip_widget), 8);
g_object_ref (priv->tooltip_widget);
- g_signal_connect (priv->tooltip_widget, "destroy",
- G_CALLBACK (individual_view_tooltip_destroy_cb), view);
+
+ tp_g_signal_connect_object (priv->tooltip_widget, "destroy",
+ G_CALLBACK (individual_view_tooltip_destroy_cb), view, 0);
+
gtk_widget_show (priv->tooltip_widget);
}
else
FolksPersona *persona = NULL;
const gchar *persona_uid;
GList *individuals, *l;
+ GeeIterator *iter = NULL;
gboolean retval = FALSE;
persona_uid = (const gchar *) gtk_selection_data_get_data (selection);
for (l = individuals; l != NULL; l = l->next)
{
- GList *personas, *p;
+ GeeSet *personas;
personas = folks_individual_get_personas (FOLKS_INDIVIDUAL (l->data));
-
- for (p = personas; p != NULL; p = p->next)
+ iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+ while (gee_iterator_next (iter))
{
- if (!tp_strdiff (folks_persona_get_uid (FOLKS_PERSONA (p->data)),
- persona_uid))
+ FolksPersona *persona_cur = gee_iterator_get (iter);
+
+ if (!tp_strdiff (folks_persona_get_uid (persona), persona_uid))
{
- persona = g_object_ref (p->data);
+ /* takes ownership of the ref */
+ persona = persona_cur;
individual = g_object_ref (l->data);
goto got_persona;
}
+ g_clear_object (&persona_cur);
}
+ g_clear_object (&iter);
}
got_persona:
+ g_clear_object (&iter);
g_list_free (individuals);
if (persona == NULL || individual == NULL)
EmpathyContact *contact = NULL;
contact = empathy_contact_dup_from_folks_individual (individual);
- caps = empathy_contact_get_capabilities (contact);
+ if (contact != NULL)
+ caps = empathy_contact_get_capabilities (contact);
tp_clear_object (&contact);
}
priv = GET_PRIV (widget);
- GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget,
- context);
-
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
+ GTK_WIDGET_CLASS (empathy_individual_view_parent_class)->drag_begin (widget,
+ context);
+
path = gtk_tree_model_get_path (model, &iter);
priv->drag_row = gtk_tree_row_reference_new (model, path);
gtk_tree_path_free (path);
if (info == DND_DRAG_TYPE_INDIVIDUAL_ID)
{
gtk_selection_data_set (selection,
- gdk_atom_intern ("text/individual-id", FALSE), 8,
+ gdk_atom_intern ("text/x-individual-id", FALSE), 8,
(guchar *) individual_id, strlen (individual_id) + 1);
}
gtk_tree_row_reference_free (priv->drag_row);
priv->drag_row = NULL;
}
+
+ if (priv->auto_scroll_timeout_id != 0)
+ {
+ g_source_remove (priv->auto_scroll_timeout_id);
+ priv->auto_scroll_timeout_id = 0;
+ }
}
static gboolean
g_idle_add (individual_view_popup_menu_idle_cb, data);
} else if (event->keyval == GDK_KEY_F2) {
FolksIndividual *individual;
- EmpathyContact *contact;
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE);
if (individual == NULL)
return FALSE;
- contact = empathy_contact_dup_from_folks_individual (individual);
- if (contact == NULL) {
- g_object_unref (individual);
- return FALSE;
- }
- empathy_contact_edit_dialog_show (contact, NULL);
+ empathy_individual_edit_dialog_show (individual, NULL);
g_object_unref (individual);
- g_object_unref (contact);
}
return FALSE;
shell = GTK_MENU_SHELL (menu);
/* audio */
- item = empathy_individual_audio_call_menu_item_new (individual, NULL);
+ item = empathy_individual_audio_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
/* video */
- item = empathy_individual_video_call_menu_item_new (individual, NULL);
+ item = empathy_individual_video_call_menu_item_new_individual (NULL,
+ individual);
gtk_menu_shell_append (shell, item);
gtk_widget_show (item);
if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
{
- pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
+ pixbuf = tpaw_pixbuf_from_icon_name ("emblem-favorite",
GTK_ICON_SIZE_MENU);
}
else if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY))
{
- pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp",
+ pixbuf = tpaw_pixbuf_from_icon_name ("im-local-xmpp",
GTK_ICON_SIZE_MENU);
}
}
static void
-individual_view_search_text_notify_cb (EmpathyLiveSearch *search,
+individual_view_search_text_notify_cb (TpawLiveSearch *search,
GParamSpec *pspec,
EmpathyIndividualView *view)
{
GdkEvent *event,
EmpathyIndividualView *view)
{
- GdkEventKey *eventkey = ((GdkEventKey *) event);
+ GdkEvent *new_event;
gboolean ret = FALSE;
- if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down
- || eventkey->keyval == GDK_KEY_F2)
- {
- GdkEvent *new_event;
-
- new_event = gdk_event_copy (event);
- gtk_widget_grab_focus (GTK_WIDGET (view));
- ret = gtk_widget_event (GTK_WIDGET (view), new_event);
- gtk_widget_grab_focus (search);
+ new_event = gdk_event_copy (event);
+ gtk_widget_grab_focus (GTK_WIDGET (view));
+ ret = gtk_widget_event (GTK_WIDGET (view), new_event);
+ gtk_widget_grab_focus (search);
- gdk_event_free (new_event);
- }
+ gdk_event_free (new_event);
return ret;
}
static void
-individual_view_search_hide_cb (EmpathyLiveSearch *search,
+individual_view_search_hide_cb (TpawLiveSearch *search,
EmpathyIndividualView *view)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);
}
static void
-individual_view_search_show_cb (EmpathyLiveSearch *search,
+individual_view_search_show_cb (TpawLiveSearch *search,
EmpathyIndividualView *view)
{
/* block expand or collapse handlers during expand all, they would
EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name,
-1);
- if (is_group == FALSE)
+ if (!is_group)
{
g_free (name);
return FALSE;
priv = GET_PRIV (self);
if (g_hash_table_lookup_extended (priv->expand_groups, name, NULL,
- &should_expand) == TRUE)
+ &should_expand))
{
- if (GPOINTER_TO_INT (should_expand) == TRUE)
+ if (GPOINTER_TO_INT (should_expand))
gtk_tree_view_expand_row (GTK_TREE_VIEW (self), path, FALSE);
else
gtk_tree_view_collapse_row (GTK_TREE_VIEW (self), path);
{
EmpathyIndividualViewPriv *priv = GET_PRIV (self);
- DEBUG ("individual_view_expand_idle_cb");
-
g_signal_handlers_block_by_func (self,
individual_view_row_expand_or_collapse_cb, GINT_TO_POINTER (TRUE));
g_signal_handlers_block_by_func (self,
EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name,
-1);
- if (!is_group || EMP_STR_EMPTY (name))
+ if (!is_group || TPAW_STR_EMPTY (name))
{
g_free (name);
return;
* gtk_tree_model_filter_refilter (). We add the rows to expand/contract to
* a hash table, and expand or contract them as appropriate all at once in
* an idle handler which iterates over all the group rows. */
- if (g_hash_table_lookup_extended (priv->expand_groups, name, NULL,
- &will_expand) == FALSE ||
+ if (!g_hash_table_lookup_extended (priv->expand_groups, name, NULL,
+ &will_expand) ||
GPOINTER_TO_INT (will_expand) != should_expand)
{
g_hash_table_insert (priv->expand_groups, g_strdup (name),
g_free (name);
}
-/* FIXME: This is a workaround for bgo#621076 */
-static void
-individual_view_verify_group_visibility (EmpathyIndividualView *view,
- GtkTreePath *path)
-{
- EmpathyIndividualViewPriv *priv = GET_PRIV (view);
- GtkTreeModel *model;
- GtkTreePath *parent_path;
- GtkTreeIter parent_iter;
-
- if (gtk_tree_path_get_depth (path) < 2)
- return;
-
- /* A group row is visible if and only if at least one if its child is visible.
- * So when a row is inserted/deleted/changed in the base model, that could
- * modify the visibility of its parent in the filter model.
- */
-
- model = GTK_TREE_MODEL (priv->store);
- parent_path = gtk_tree_path_copy (path);
- gtk_tree_path_up (parent_path);
- if (gtk_tree_model_get_iter (model, &parent_iter, parent_path))
- {
- /* This tells the filter to verify the visibility of that row, and
- * show/hide it if necessary */
- gtk_tree_model_row_changed (GTK_TREE_MODEL (priv->store),
- parent_path, &parent_iter);
- }
- gtk_tree_path_free (parent_path);
-}
-
-static void
-individual_view_store_row_changed_cb (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- EmpathyIndividualView *view)
-{
- individual_view_verify_group_visibility (view, path);
-}
-
-static void
-individual_view_store_row_deleted_cb (GtkTreeModel *model,
- GtkTreePath *path,
- EmpathyIndividualView *view)
-{
- individual_view_verify_group_visibility (view, path);
-}
-
static gboolean
individual_view_is_visible_individual (EmpathyIndividualView *self,
FolksIndividual *individual,
gboolean is_online,
gboolean is_searching,
const gchar *group,
- gboolean is_fake_group)
+ gboolean is_fake_group,
+ guint event_count)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (self);
- EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
- const gchar *str;
- GList *personas, *l;
- gboolean is_favorite, contains_interesting_persona = FALSE;
+ TpawLiveSearch *live = TPAW_LIVE_SEARCH (priv->search_widget);
+ GeeSet *personas;
+ GeeIterator *iter;
+ gboolean is_favorite;
+
+ /* Always display individuals having pending events */
+ if (event_count > 0)
+ return TRUE;
/* We're only giving the visibility wrt filtering here, not things like
* presence. */
- if (priv->show_untrusted == FALSE &&
+ if (!priv->show_untrusted &&
folks_individual_get_trust_level (individual) == FOLKS_TRUST_LEVEL_NONE)
{
return FALSE;
}
- /* Hide all individuals which consist entirely of uninteresting personas */
- personas = folks_individual_get_personas (individual);
- for (l = personas; l; l = l->next)
+ if (!priv->show_uninteresting)
{
- if (empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
+ gboolean contains_interesting_persona = FALSE;
+
+ /* Hide all individuals which consist entirely of uninteresting
+ * personas */
+ personas = folks_individual_get_personas (individual);
+ iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+ while (!contains_interesting_persona && gee_iterator_next (iter))
{
- contains_interesting_persona = TRUE;
- break;
+ FolksPersona *persona = gee_iterator_get (iter);
+
+ if (empathy_folks_persona_is_interesting (persona))
+ contains_interesting_persona = TRUE;
+
+ g_clear_object (&persona);
}
- }
+ g_clear_object (&iter);
- if (contains_interesting_persona == FALSE)
- return FALSE;
+ if (!contains_interesting_persona)
+ return FALSE;
+ }
is_favorite = folks_favourite_details_get_is_favourite (
FOLKS_FAVOURITE_DETAILS (individual));
- if (is_searching == FALSE) {
+ if (!is_searching) {
if (is_favorite && is_fake_group &&
!tp_strdiff (group, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
/* Always display favorite contacts in the favorite group */
return (priv->show_offline || is_online);
}
- /* check alias name */
- str = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual));
-
- if (empathy_live_search_match (live, str))
- return TRUE;
-
- /* check contact id, remove the @server.com part */
- for (l = personas; l; l = l->next)
- {
- const gchar *p;
- gchar *dup_str = NULL;
- gboolean visible;
-
- if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
- continue;
-
- str = folks_persona_get_display_id (l->data);
- p = strstr (str, "@");
- if (p != NULL)
- str = dup_str = g_strndup (str, p - str);
-
- visible = empathy_live_search_match (live, str);
- g_free (dup_str);
- if (visible)
- return TRUE;
- }
-
- /* FIXME: Add more rules here, we could check phone numbers in
- * contact's vCard for example. */
-
- return FALSE;
+ return empathy_individual_match_string (individual,
+ tpaw_live_search_get_text (live),
+ tpaw_live_search_get_words (live));
}
static gchar *
GtkTreeIter child_iter;
gboolean visible, is_online;
gboolean is_searching = TRUE;
+ guint event_count;
if (priv->custom_filter != NULL)
return priv->custom_filter (model, iter, priv->custom_filter_data);
EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, &is_separator,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, &is_online,
EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
+ EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, &event_count,
-1);
if (individual != NULL)
group = get_group (model, iter, &is_fake_group);
visible = individual_view_is_visible_individual (self, individual,
- is_online, is_searching, group, is_fake_group);
+ is_online, is_searching, group, is_fake_group, event_count);
g_object_unref (individual);
g_free (group);
- /* FIXME: Work around bgo#626552/bgo#621076 */
- if (visible == TRUE)
- {
- GtkTreePath *path = gtk_tree_model_get_path (model, iter);
- individual_view_verify_group_visibility (self, path);
- gtk_tree_path_free (path);
- }
-
return visible;
}
gtk_tree_model_get (model, &child_iter,
EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, &individual,
EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, &is_online,
+ EMPATHY_INDIVIDUAL_STORE_COL_EVENT_COUNT, &event_count,
-1);
if (individual == NULL)
group = get_group (model, &child_iter, &is_fake_group);
visible = individual_view_is_visible_individual (self, individual,
- is_online, is_searching, group, is_fake_group);
+ is_online, is_searching, group, is_fake_group, event_count);
g_object_unref (individual);
g_free (group);
/* show group if it has at least one visible contact in it */
- if (visible == TRUE)
+ if (visible)
return TRUE;
}
return FALSE;
}
+static gchar * empathy_individual_view_dup_selected_group (
+ EmpathyIndividualView *view,
+ gboolean *is_fake_group);
+
+static void
+text_edited_cb (GtkCellRendererText *cellrenderertext,
+ gchar *path,
+ gchar *name,
+ EmpathyIndividualView *self)
+{
+ EmpathyIndividualViewPriv *priv = GET_PRIV (self);
+ gchar *old_name, *new_name;
+
+ g_object_set (priv->text_renderer, "editable", FALSE, NULL);
+
+ new_name = g_strdup (name);
+ g_strstrip (new_name);
+
+ if (tp_str_empty (new_name))
+ goto out;
+
+ old_name = empathy_individual_view_dup_selected_group (self, NULL);
+ g_return_if_fail (old_name != NULL);
+
+ if (tp_strdiff (old_name, new_name))
+ {
+ EmpathyConnectionAggregator *aggregator;
+
+ DEBUG ("rename group '%s' to '%s'", old_name, new_name);
+
+ aggregator = empathy_connection_aggregator_dup_singleton ();
+
+ empathy_connection_aggregator_rename_group (aggregator, old_name,
+ new_name);
+ g_object_unref (aggregator);
+ }
+
+ g_free (old_name);
+out:
+ g_free (new_name);
+}
+
+static void
+text_renderer_editing_cancelled_cb (GtkCellRenderer *renderer,
+ EmpathyIndividualView *self)
+{
+ EmpathyIndividualViewPriv *priv = GET_PRIV (self);
+
+ g_object_set (priv->text_renderer, "editable", FALSE, NULL);
+}
+
static void
individual_view_constructed (GObject *object)
{
EmpathyIndividualView *view = EMPATHY_INDIVIDUAL_VIEW (object);
+ EmpathyIndividualViewPriv *priv = GET_PRIV (view);
GtkCellRenderer *cell;
GtkTreeViewColumn *col;
guint i;
NULL);
/* Name */
- cell = empathy_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, cell, TRUE);
- gtk_tree_view_column_set_cell_data_func (col, cell,
+ priv->text_renderer = empathy_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, priv->text_renderer, TRUE);
+ gtk_tree_view_column_set_cell_data_func (col, priv->text_renderer,
(GtkTreeCellDataFunc) individual_view_text_cell_data_func, view, NULL);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"name", EMPATHY_INDIVIDUAL_STORE_COL_NAME);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"text", EMPATHY_INDIVIDUAL_STORE_COL_NAME);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"presence-type", EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"status", EMPATHY_INDIVIDUAL_STORE_COL_STATUS);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"is_group", EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"compact", EMPATHY_INDIVIDUAL_STORE_COL_COMPACT);
- gtk_tree_view_column_add_attribute (col, cell,
+ gtk_tree_view_column_add_attribute (col, priv->text_renderer,
"client-types", EMPATHY_INDIVIDUAL_STORE_COL_CLIENT_TYPES);
+ g_signal_connect (priv->text_renderer, "editing-canceled",
+ G_CALLBACK (text_renderer_editing_cancelled_cb), view);
+ g_signal_connect (priv->text_renderer, "edited",
+ G_CALLBACK (text_edited_cb), view);
+
/* Audio Call Icon */
cell = empathy_cell_renderer_activatable_new ();
gtk_tree_view_column_pack_start (col, cell, FALSE);
static void
individual_view_set_view_features (EmpathyIndividualView *view,
- EmpathyIndividualFeatureFlags features)
+ EmpathyIndividualViewFeatureFlags features)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);
gboolean has_tooltip;
if (priv->expand_groups_idle_handler != 0)
g_source_remove (priv->expand_groups_idle_handler);
- g_hash_table_destroy (priv->expand_groups);
+ g_hash_table_unref (priv->expand_groups);
G_OBJECT_CLASS (empathy_individual_view_parent_class)->finalize (object);
}
case PROP_SHOW_UNTRUSTED:
g_value_set_boolean (value, priv->show_untrusted);
break;
+ case PROP_SHOW_UNINTERESTING:
+ g_value_set_boolean (value, priv->show_uninteresting);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
empathy_individual_view_set_show_untrusted (view,
g_value_get_boolean (value));
break;
+ case PROP_SHOW_UNINTERESTING:
+ empathy_individual_view_set_show_uninteresting (view,
+ g_value_get_boolean (value));
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_individual_received),
NULL, NULL,
- _empathy_gtk_marshal_VOID__UINT_OBJECT_STRING_STRING,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 4, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL,
G_TYPE_STRING, G_TYPE_STRING);
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_persona_received),
NULL, NULL,
- _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT_OBJECT,
+ g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 3, G_TYPE_UINT, FOLKS_TYPE_PERSONA, FOLKS_TYPE_INDIVIDUAL);
g_object_class_install_property (object_class,
"Whether the view should display untrusted individuals; "
"those who could not be who they say they are.",
TRUE, G_PARAM_READWRITE));
+ g_object_class_install_property (object_class,
+ PROP_SHOW_UNINTERESTING,
+ g_param_spec_boolean ("show-uninteresting",
+ "Show Uninteresting Individuals",
+ "Whether the view should not filter out individuals using "
+ "empathy_folks_persona_is_interesting.",
+ FALSE, G_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (EmpathyIndividualViewPriv));
}
view->priv = priv;
priv->show_untrusted = TRUE;
+ priv->show_uninteresting = FALSE;
/* Get saved group states. */
empathy_contact_groups_get_all ();
{
REMOVE_DIALOG_RESPONSE_CANCEL = 0,
REMOVE_DIALOG_RESPONSE_DELETE,
- REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK,
};
static int
individual_view_remove_dialog_show (GtkWindow *parent,
const gchar *message,
- const gchar *secondary_text,
- gboolean block_button,
- GdkPixbuf *avatar)
+ const gchar *secondary_text)
{
GtkWidget *dialog;
gboolean res;
dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", message);
- if (avatar != NULL)
- {
- GtkWidget *image = gtk_image_new_from_pixbuf (avatar);
- gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
- gtk_widget_show (image);
- }
-
- if (block_button)
- {
- GtkWidget *button;
-
- /* gtk_dialog_add_button() doesn't allow us to pass a string with a
- * mnemonic so we have to create the button manually. */
- button = gtk_button_new_with_mnemonic (
- _("Delete and _Block"));
-
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
- REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK);
-
- gtk_widget_show (button);
- }
-
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, REMOVE_DIALOG_RESPONSE_CANCEL,
GTK_STOCK_DELETE, REMOVE_DIALOG_RESPONSE_DELETE, NULL);
text =
g_strdup_printf (_("Do you really want to remove the group '%s'?"),
group);
- parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+ parent = tpaw_get_toplevel_window (GTK_WIDGET (view));
if (individual_view_remove_dialog_show (parent, _("Removing group"),
- text, FALSE, NULL) == REMOVE_DIALOG_RESPONSE_DELETE)
+ text) == REMOVE_DIALOG_RESPONSE_DELETE)
{
EmpathyIndividualManager *manager =
empathy_individual_manager_dup_singleton ();
g_free (group);
}
+static void
+individual_view_group_rename_activate_cb (GtkMenuItem *menuitem,
+ EmpathyIndividualView *self)
+{
+ EmpathyIndividualViewPriv *priv = GET_PRIV (self);
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return;
+ path = gtk_tree_model_get_path (model, &iter);
+
+ g_object_set (G_OBJECT (priv->text_renderer), "editable", TRUE, NULL);
+
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (self), FALSE);
+ gtk_widget_grab_focus (GTK_WIDGET (self));
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path,
+ gtk_tree_view_get_column (GTK_TREE_VIEW (self), 0), TRUE);
+
+ gtk_tree_path_free (path);
+}
+
GtkWidget *
empathy_individual_view_get_group_menu (EmpathyIndividualView *view)
{
menu = gtk_menu_new ();
- /* TODO: implement
- if (priv->view_features &
- EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME) {
- item = gtk_menu_item_new_with_mnemonic (_("Re_name"));
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- g_signal_connect (item, "activate",
- G_CALLBACK (individual_view_group_rename_activate_cb),
- view);
+ if (priv->view_features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_RENAME)
+ {
+ item = gtk_menu_item_new_with_mnemonic (_("Re_name"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show (item);
+ g_signal_connect (item, "activate",
+ G_CALLBACK (individual_view_group_rename_activate_cb), view);
}
- */
if (priv->view_features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_REMOVE)
{
return menu;
}
-static void
-got_avatar (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object);
- EmpathyIndividualView *view = user_data;
- GdkPixbuf *avatar;
- EmpathyIndividualManager *manager;
- gchar *text;
- GtkWindow *parent;
- GList *l, *personas;
- guint persona_count = 0;
- gboolean can_block;
- GError *error = NULL;
- gint res;
-
- avatar = empathy_pixbuf_avatar_from_individual_scaled_finish (individual,
- result, &error);
-
- if (error != NULL)
- {
- DEBUG ("Could not get avatar: %s", error->message);
- g_error_free (error);
- }
-
- /* We couldn't retrieve the avatar, but that isn't a fatal error,
- * so we still display the remove dialog. */
-
- personas = folks_individual_get_personas (individual);
-
- /* If we have more than one TpfPersona, display a different message
- * ensuring the user knows that *all* of the meta-contacts' personas will
- * be removed. */
- for (l = personas; l != NULL; l = l->next)
- {
- if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (l->data)))
- continue;
-
- persona_count++;
- if (persona_count >= 2)
- break;
- }
-
- if (persona_count < 2)
- {
- /* Not a meta-contact */
- text =
- g_strdup_printf (
- _("Do you really want to remove the contact '%s'?"),
- folks_alias_details_get_alias (
- FOLKS_ALIAS_DETAILS (individual)));
- }
- else
- {
- /* Meta-contact */
- text =
- g_strdup_printf (
- _("Do you really want to remove the linked contact '%s'? "
- "Note that this will remove all the contacts which make up "
- "this linked contact."),
- folks_alias_details_get_alias (
- FOLKS_ALIAS_DETAILS (individual)));
- }
-
-
- manager = empathy_individual_manager_dup_singleton ();
- can_block = empathy_individual_manager_supports_blocking (manager,
- individual);
- parent = empathy_get_toplevel_window (GTK_WIDGET (view));
- res = individual_view_remove_dialog_show (parent, _("Removing contact"),
- text, can_block, avatar);
-
- if (res == REMOVE_DIALOG_RESPONSE_DELETE ||
- res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK)
- {
- gboolean abusive;
-
- if (res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK)
- {
- if (!empathy_block_individual_dialog_show (parent, individual,
- avatar, &abusive))
- goto finally;
-
- empathy_individual_manager_set_blocked (manager, individual,
- TRUE, abusive);
- }
-
- empathy_individual_manager_remove (manager, individual, "");
- }
-
- finally:
- g_free (text);
- g_object_unref (manager);
-}
-
-static void
-individual_view_remove_activate_cb (GtkMenuItem *menuitem,
- EmpathyIndividualView *view)
-{
- FolksIndividual *individual;
-
- individual = empathy_individual_view_dup_selected (view);
-
- if (individual != NULL)
- {
- empathy_pixbuf_avatar_from_individual_scaled_async (individual,
- 48, 48, NULL, got_avatar, view);
- g_object_unref (individual);
- }
-}
-
-static void
-individual_menu_link_contacts_activated_cb (EmpathyIndividualMenu *menu,
- EmpathyLinkingDialog *linking_dialog,
- EmpathyIndividualView *self)
-{
- EmpathyIndividualViewPriv *priv = GET_PRIV (self);
- EmpathyIndividualLinker *linker;
-
- linker = empathy_linking_dialog_get_individual_linker (linking_dialog);
- empathy_individual_linker_set_search_text (linker,
- empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search_widget)));
-}
-
GtkWidget *
empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);
FolksIndividual *individual;
GtkWidget *menu = NULL;
- GtkWidget *item;
- GtkWidget *image;
- gboolean can_remove = FALSE;
- GList *l;
g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL);
+ if (priv->individual_features == EMPATHY_INDIVIDUAL_FEATURE_NONE)
+ /* No need to create a context menu */
+ return NULL;
+
individual = empathy_individual_view_dup_selected (view);
if (individual == NULL)
return NULL;
- /* If any of the Individual's personas can be removed, add an option to
- * remove. This will act as a best-effort option. If any Personas cannot be
- * removed from the server, then this option will just be inactive upon
- * subsequent menu openings */
- for (l = folks_individual_get_personas (individual); l != NULL; l = l->next)
- {
- FolksPersona *persona = FOLKS_PERSONA (l->data);
- FolksPersonaStore *store = folks_persona_get_store (persona);
- FolksMaybeBool maybe_can_remove =
- folks_persona_store_get_can_remove_personas (store);
-
- if (maybe_can_remove == FOLKS_MAYBE_BOOL_TRUE)
- {
- can_remove = TRUE;
- break;
- }
- }
-
- menu = empathy_individual_menu_new (individual, priv->individual_features);
-
- /* Remove contact */
- if ((priv->view_features &
- EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_REMOVE) &&
- can_remove)
- {
- /* create the menu if required, or just add a separator */
- if (menu == NULL)
- menu = gtk_menu_new ();
- else
- {
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- }
-
- /* Remove */
- item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
- image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- gtk_widget_show (item);
- g_signal_connect (item, "activate",
- G_CALLBACK (individual_view_remove_activate_cb), view);
- }
+ if (!empathy_folks_individual_contains_contact (individual))
+ goto out;
- /* Connect to EmpathyIndividualMenu::link-contacts-activated so that we can
- * set the live search text on the new linking dialogue to be the same as
- * our own. */
- g_signal_connect (menu, "link-contacts-activated",
- (GCallback) individual_menu_link_contacts_activated_cb, view);
+ menu = empathy_individual_menu_new (individual, NULL,
+ priv->individual_features, priv->store);
+out:
g_object_unref (individual);
return menu;
void
empathy_individual_view_set_live_search (EmpathyIndividualView *view,
- EmpathyLiveSearch *search)
+ TpawLiveSearch *search)
{
EmpathyIndividualViewPriv *priv = GET_PRIV (view);
/* Destroy the old filter and remove the old store */
if (priv->store != NULL)
{
- g_signal_handlers_disconnect_by_func (priv->store,
- individual_view_store_row_changed_cb, self);
- g_signal_handlers_disconnect_by_func (priv->store,
- individual_view_store_row_deleted_cb, self);
-
g_signal_handlers_disconnect_by_func (priv->filter,
individual_view_row_has_child_toggled_cb, self);
G_CALLBACK (individual_view_row_has_child_toggled_cb), self);
gtk_tree_view_set_model (GTK_TREE_VIEW (self),
GTK_TREE_MODEL (priv->filter));
-
- tp_g_signal_connect_object (priv->store, "row-changed",
- G_CALLBACK (individual_view_store_row_changed_cb), self, 0);
- tp_g_signal_connect_object (priv->store, "row-inserted",
- G_CALLBACK (individual_view_store_row_changed_cb), self, 0);
- tp_g_signal_connect_object (priv->store, "row-deleted",
- G_CALLBACK (individual_view_store_row_deleted_cb), self, 0);
}
}
priv->custom_filter = filter;
priv->custom_filter_data = data;
}
+
+void
+empathy_individual_view_refilter (EmpathyIndividualView *self)
+{
+ EmpathyIndividualViewPriv *priv = GET_PRIV (self);
+
+ gtk_tree_model_filter_refilter (priv->filter);
+}
+
+void
+empathy_individual_view_select_first (EmpathyIndividualView *self)
+{
+ EmpathyIndividualViewPriv *priv = GET_PRIV (self);
+ GtkTreeIter iter;
+
+ gtk_tree_model_filter_refilter (priv->filter);
+
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->filter), &iter))
+ {
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (self));
+
+ gtk_tree_selection_select_iter (selection, &iter);
+ }
+}
+
+void
+empathy_individual_view_set_show_uninteresting (EmpathyIndividualView *self,
+ gboolean show_uninteresting)
+{
+ EmpathyIndividualViewPriv *priv;
+
+ g_return_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (self));
+
+ priv = GET_PRIV (self);
+
+ priv->show_uninteresting = show_uninteresting;
+
+ g_object_notify (G_OBJECT (self), "show-uninteresting");
+ gtk_tree_model_filter_refilter (priv->filter);
+}
projects / empathy.git / blobdiff