X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-individual-view.c;h=90618997d36e1295c2f388681b341a235fd24315;hp=f2574408f97865ffb9ff1d625af4f14b2bf69c09;hb=6048958136681930af236460e9cb159b5267c4d0;hpb=f22e466ab6e525a148145f66aed3ce4a0f23128a diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index f2574408..90618997 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -40,13 +40,14 @@ #include #include -#include +#include #include #include "empathy-individual-view.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" -#include "empathy-contact-dialogs.h" +#include "empathy-individual-edit-dialog.h" +#include "empathy-individual-dialogs.h" #include "empathy-images.h" #include "empathy-linking-dialog.h" #include "empathy-cell-renderer-expander.h" @@ -54,7 +55,6 @@ #include "empathy-cell-renderer-activatable.h" #include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" -#include "empathy-gtk-marshal.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include @@ -74,6 +74,7 @@ typedef struct gboolean show_offline; gboolean show_untrusted; + gboolean show_uninteresting; GtkTreeModelFilter *filter; GtkWidget *search_widget; @@ -87,6 +88,9 @@ typedef struct /* Distance between mouse pointer and the nearby border. Negative when scrolling updards.*/ gint distance; + + GtkTreeModelFilterVisibleFunc custom_filter; + gpointer custom_filter_data; } EmpathyIndividualViewPriv; typedef struct @@ -111,24 +115,26 @@ enum 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 * specific EmpathyContacts (between/in/out of Individuals) */ -enum DndDragType +typedef enum { - DND_DRAG_TYPE_INDIVIDUAL_ID, + DND_DRAG_TYPE_UNKNOWN = -1, + DND_DRAG_TYPE_INDIVIDUAL_ID = 0, DND_DRAG_TYPE_PERSONA_ID, DND_DRAG_TYPE_URI_LIST, DND_DRAG_TYPE_STRING, -}; +} DndDragType; #define DRAG_TYPE(T,I) \ { (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), @@ -136,13 +142,12 @@ static const GtkTargetEntry drag_types_dest[] = { }; 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 static GdkAtom drag_atoms_dest[G_N_ELEMENTS (drag_types_dest)]; -static GdkAtom drag_atoms_source[G_N_ELEMENTS (drag_types_source)]; enum { @@ -214,8 +219,10 @@ individual_view_query_tooltip_cb (EmpathyIndividualView *view, 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 @@ -239,10 +246,10 @@ groups_change_group_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - FolksGroupable *groupable = FOLKS_GROUPABLE (source); + FolksGroupDetails *group_details = FOLKS_GROUP_DETAILS (source); GError *error = NULL; - folks_groupable_change_group_finish (groupable, result, &error); + folks_group_details_change_group_finish (group_details, result, &error); if (error != NULL) { g_warning ("failed to change group: %s", error->message); @@ -373,14 +380,16 @@ real_drag_individual_received_cb (EmpathyIndividualView *self, if (!tp_strdiff (new_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE)) { /* Mark contact as favourite */ - folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), TRUE); + folks_favourite_details_set_is_favourite ( + FOLKS_FAVOURITE_DETAILS (individual), TRUE); return; } if (!tp_strdiff (old_group, EMPATHY_INDIVIDUAL_STORE_FAVORITE)) { /* Remove contact as favourite */ - folks_favouritable_set_is_favourite (FOLKS_FAVOURITABLE (individual), FALSE); + folks_favourite_details_set_is_favourite ( + FOLKS_FAVOURITE_DETAILS (individual), FALSE); /* Don't try to remove it */ old_group = NULL; @@ -388,14 +397,14 @@ real_drag_individual_received_cb (EmpathyIndividualView *self, if (new_group != NULL) { - folks_groupable_change_group (FOLKS_GROUPABLE (individual), new_group, TRUE, - groups_change_group_cb, NULL); + folks_group_details_change_group (FOLKS_GROUP_DETAILS (individual), + new_group, TRUE, groups_change_group_cb, NULL); } if (old_group != NULL && action == GDK_ACTION_MOVE) { - folks_groupable_change_group (FOLKS_GROUPABLE (individual), old_group, - FALSE, groups_change_group_cb, NULL); + folks_group_details_change_group (FOLKS_GROUP_DETAILS (individual), + old_group, FALSE, groups_change_group_cb, NULL); } } @@ -406,16 +415,14 @@ individual_view_persona_drag_received (GtkWidget *self, GtkTreePath *path, GtkSelectionData *selection) { - EmpathyIndividualViewPriv *priv; EmpathyIndividualManager *manager = NULL; FolksIndividual *individual = NULL; FolksPersona *persona = NULL; const gchar *persona_uid; GList *individuals, *l; + GeeIterator *iter = NULL; gboolean retval = FALSE; - priv = GET_PRIV (self); - persona_uid = (const gchar *) gtk_selection_data_get_data (selection); /* FIXME: This is slow, but the only way to find the Persona we're having @@ -425,23 +432,28 @@ individual_view_persona_drag_received (GtkWidget *self, 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) @@ -598,6 +610,8 @@ individual_view_drag_motion (GtkWidget *widget, gboolean cleanup = TRUE; gboolean retval = TRUE; GtkAllocation allocation; + guint i; + DndDragType drag_type = DND_DRAG_TYPE_UNKNOWN; priv = GET_PRIV (EMPATHY_INDIVIDUAL_VIEW (widget)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); @@ -649,8 +663,18 @@ individual_view_drag_motion (GtkWidget *widget, target = gtk_drag_dest_find_target (widget, context, NULL); gtk_tree_model_get_iter (model, &iter, path); - if (target == drag_atoms_dest[DND_DRAG_TYPE_URI_LIST] || - target == drag_atoms_dest[DND_DRAG_TYPE_STRING]) + /* Determine the DndDragType of the data */ + for (i = 0; i < G_N_ELEMENTS (drag_atoms_dest); i++) + { + if (target == drag_atoms_dest[i]) + { + drag_type = drag_types_dest[i].info; + break; + } + } + + if (drag_type == DND_DRAG_TYPE_URI_LIST || + drag_type == DND_DRAG_TYPE_STRING) { /* This is a file drag, and it can only be dropped on contacts, * not groups. @@ -671,13 +695,15 @@ individual_view_drag_motion (GtkWidget *widget, 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); } if (individual != NULL && - folks_presence_owner_is_online (FOLKS_PRESENCE_OWNER (individual)) && + folks_presence_details_is_online ( + FOLKS_PRESENCE_DETAILS (individual)) && (caps & EMPATHY_CAPABILITIES_FT)) { gdk_drag_status (context, GDK_ACTION_COPY, time_); @@ -694,10 +720,10 @@ individual_view_drag_motion (GtkWidget *widget, if (individual != NULL) g_object_unref (individual); } - else if ((target == drag_atoms_dest[DND_DRAG_TYPE_INDIVIDUAL_ID] && + else if ((drag_type == DND_DRAG_TYPE_INDIVIDUAL_ID && (priv->view_features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE || priv->drag_row == NULL)) || - (target == drag_atoms_dest[DND_DRAG_TYPE_PERSONA_ID] && + (drag_type == DND_DRAG_TYPE_PERSONA_ID && priv->view_features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP)) { /* If target != GDK_NONE, then we have a contact (individual or persona) @@ -789,13 +815,13 @@ individual_view_drag_begin (GtkWidget *widget, 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); @@ -842,7 +868,8 @@ individual_view_drag_data_get (GtkWidget *widget, if (info == DND_DRAG_TYPE_INDIVIDUAL_ID) { - gtk_selection_data_set (selection, drag_atoms_source[info], 8, + gtk_selection_data_set (selection, + gdk_atom_intern ("text/x-individual-id", FALSE), 8, (guchar *) individual_id, strlen (individual_id) + 1); } @@ -865,6 +892,12 @@ individual_view_drag_end (GtkWidget *widget, 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 @@ -888,11 +921,11 @@ static void menu_deactivate_cb (GtkMenuShell *menushell, gpointer user_data) { - gtk_menu_detach (GTK_MENU (menushell)); - /* FIXME: we shouldn't have to disconnec the signal (bgo #641327) */ g_signal_handlers_disconnect_by_func (menushell, menu_deactivate_cb, user_data); + + gtk_menu_detach (GTK_MENU (menushell)); } static gboolean @@ -963,7 +996,6 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, 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); @@ -971,15 +1003,9 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, 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; @@ -1015,7 +1041,7 @@ individual_view_row_activated (GtkTreeView *view, { DEBUG ("Starting a chat"); - empathy_dispatcher_chat_with_contact (contact, + empathy_chat_with_contact (contact, gtk_get_current_event_time ()); } @@ -1051,25 +1077,22 @@ individual_view_call_activated_cb (EmpathyCellRendererActivatable *cell, event = (GdkEventButton *) gtk_get_current_event (); - menu = gtk_menu_new (); + menu = empathy_context_menu_new (GTK_WIDGET (view)); 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); 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); gtk_menu_shell_append (shell, item); gtk_widget_show (item); - gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (view), NULL); gtk_widget_show (menu); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); - g_object_ref_sink (menu); - g_object_unref (menu); g_object_unref (individual); } @@ -1395,21 +1418,15 @@ individual_view_search_key_navigation_cb (GtkWidget *search, 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; } @@ -1518,7 +1535,7 @@ expand_idle_foreach_cb (GtkTreeModel *model, EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name, -1); - if (is_group == FALSE) + if (!is_group) { g_free (name); return FALSE; @@ -1527,9 +1544,9 @@ expand_idle_foreach_cb (GtkTreeModel *model, 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); @@ -1608,8 +1625,8 @@ individual_view_row_has_child_toggled_cb (GtkTreeModel *model, * 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), @@ -1626,110 +1643,94 @@ individual_view_row_has_child_toggled_cb (GtkTreeModel *model, 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) + gboolean is_searching, + const gchar *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; + 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; } - if (is_searching == FALSE) - return (priv->show_offline || is_online); - - /* check alias name */ - str = folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)); + if (!priv->show_uninteresting) + { + gboolean contains_interesting_persona = FALSE; - if (empathy_live_search_match (live, str)) - return TRUE; + /* 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)) + { + FolksPersona *persona = gee_iterator_get (iter); - /* check contact id, remove the @server.com part */ - personas = folks_individual_get_personas (individual); - for (l = personas; l; l = l->next) - { - const gchar *p; - gchar *dup_str = NULL; - gboolean visible; + if (empathy_folks_persona_is_interesting (persona)) + contains_interesting_persona = TRUE; - if (!TPF_IS_PERSONA (l->data)) - continue; + g_clear_object (&persona); + } + g_clear_object (&iter); - str = folks_persona_get_display_id (l->data); - p = strstr (str, "@"); - if (p != NULL) - str = dup_str = g_strndup (str, p - str); + if (!contains_interesting_persona) + return FALSE; + } - visible = empathy_live_search_match (live, str); - g_free (dup_str); - if (visible) + is_favorite = folks_favourite_details_get_is_favourite ( + FOLKS_FAVOURITE_DETAILS (individual)); + 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 TRUE; - } - /* FIXME: Add more rules here, we could check phone numbers in - * contact's vCard for example. */ + return (priv->show_offline || is_online); + } - return FALSE; + return empathy_individual_match_string (individual, + empathy_live_search_get_text (live), + empathy_live_search_get_words (live)); } +static gchar * +get_group (GtkTreeModel *model, + GtkTreeIter *iter, + gboolean *is_fake) +{ + GtkTreeIter parent_iter; + gchar *name = NULL; + + *is_fake = FALSE; + + if (!gtk_tree_model_iter_parent (model, &parent_iter, iter)) + return NULL; + + gtk_tree_model_get (model, &parent_iter, + EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name, + EMPATHY_INDIVIDUAL_STORE_COL_IS_FAKE_GROUP, is_fake, + -1); + + return name; +} + + static gboolean individual_view_filter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, @@ -1742,6 +1743,10 @@ individual_view_filter_visible_func (GtkTreeModel *model, 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); if (priv->search_widget == NULL || !gtk_widget_get_visible (priv->search_widget)) @@ -1752,22 +1757,21 @@ individual_view_filter_visible_func (GtkTreeModel *model, 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) { + gchar *group; + gboolean is_fake_group; + + group = get_group (model, iter, &is_fake_group); + visible = individual_view_is_visible_individual (self, individual, - is_online, is_searching); + is_online, is_searching, group, is_fake_group, event_count); g_object_unref (individual); - - /* 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); - } + g_free (group); return visible; } @@ -1782,20 +1786,28 @@ individual_view_filter_visible_func (GtkTreeModel *model, for (valid = gtk_tree_model_iter_children (model, &child_iter, iter); valid; valid = gtk_tree_model_iter_next (model, &child_iter)) { + gchar *group; + gboolean is_fake_group; + 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) continue; + group = get_group (model, &child_iter, &is_fake_group); + visible = individual_view_is_visible_individual (self, individual, - is_online, is_searching); + 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; } @@ -1909,12 +1921,6 @@ individual_view_constructed (GObject *object) { drag_atoms_dest[i] = gdk_atom_intern (drag_types_dest[i].target, FALSE); } - - for (i = 0; i < G_N_ELEMENTS (drag_types_source); ++i) - { - drag_atoms_source[i] = gdk_atom_intern (drag_types_source[i].target, - FALSE); - } } static void @@ -1993,7 +1999,7 @@ individual_view_finalize (GObject *object) 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); } @@ -2025,6 +2031,9 @@ individual_view_get_property (GObject *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; @@ -2059,6 +2068,9 @@ individual_view_set_property (GObject *object, 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; @@ -2098,7 +2110,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass) 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); @@ -2108,7 +2120,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass) 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, @@ -2145,6 +2157,13 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass) "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)); } @@ -2158,6 +2177,7 @@ empathy_individual_view_init (EmpathyIndividualView *view) view->priv = priv; priv->show_untrusted = TRUE; + priv->show_uninteresting = FALSE; /* Get saved group states. */ empathy_contact_groups_get_all (); @@ -2199,7 +2219,6 @@ empathy_individual_view_new (EmpathyIndividualStore *store, FolksIndividual * empathy_individual_view_dup_selected (EmpathyIndividualView *view) { - EmpathyIndividualViewPriv *priv; GtkTreeSelection *selection; GtkTreeIter iter; GtkTreeModel *model; @@ -2207,8 +2226,6 @@ empathy_individual_view_dup_selected (EmpathyIndividualView *view) g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL); - priv = GET_PRIV (view); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return NULL; @@ -2223,7 +2240,6 @@ static gchar * empathy_individual_view_dup_selected_group (EmpathyIndividualView *view, gboolean *is_fake_group) { - EmpathyIndividualViewPriv *priv; GtkTreeSelection *selection; GtkTreeIter iter; GtkTreeModel *model; @@ -2233,8 +2249,6 @@ empathy_individual_view_dup_selected_group (EmpathyIndividualView *view, g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), NULL); - priv = GET_PRIV (view); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return NULL; @@ -2256,19 +2270,51 @@ empathy_individual_view_dup_selected_group (EmpathyIndividualView *view, return name; } -static gboolean +enum +{ + 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) + const gchar *secondary_text, + gboolean block_button, + GdkPixbuf *avatar) { 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, GTK_RESPONSE_NO, - GTK_STOCK_DELETE, GTK_RESPONSE_YES, NULL); + GTK_STOCK_CANCEL, REMOVE_DIALOG_RESPONSE_CANCEL, + GTK_STOCK_DELETE, REMOVE_DIALOG_RESPONSE_DELETE, NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); @@ -2277,7 +2323,7 @@ individual_view_remove_dialog_show (GtkWindow *parent, res = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - return (res == GTK_RESPONSE_YES); + return res; } static void @@ -2297,7 +2343,7 @@ individual_view_group_remove_activate_cb (GtkMenuItem *menuitem, group); parent = empathy_get_toplevel_window (GTK_WIDGET (view)); if (individual_view_remove_dialog_show (parent, _("Removing group"), - text)) + text, FALSE, NULL) == REMOVE_DIALOG_RESPONSE_DELETE) { EmpathyIndividualManager *manager = empathy_individual_manager_dup_singleton (); @@ -2367,67 +2413,126 @@ empathy_individual_view_get_group_menu (EmpathyIndividualView *view) } static void -individual_view_remove_activate_cb (GtkMenuItem *menuitem, - EmpathyIndividualView *view) +got_avatar (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - FolksIndividual *individual; + FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object); + EmpathyIndividualView *view = user_data; + EmpathyIndividualViewPriv *priv = GET_PRIV (view); + GdkPixbuf *avatar; + EmpathyIndividualManager *manager; + gchar *text; + GtkWindow *parent; + GeeSet *personas; + guint persona_count = 0; + gboolean can_block; + GError *error = NULL; + gint res; - individual = empathy_individual_view_dup_selected (view); + avatar = empathy_pixbuf_avatar_from_individual_scaled_finish (individual, + result, &error); - if (individual != NULL) + if (error != NULL) { - gchar *text; - GtkWindow *parent; - GList *l, *personas; - guint persona_count = 0; + DEBUG ("Could not get avatar: %s", error->message); + g_error_free (error); + } - personas = folks_individual_get_personas (individual); + /* We couldn't retrieve the avatar, but that isn't a fatal error, + * so we still display the remove dialog. */ - /* 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 (!TPF_IS_PERSONA (l->data)) - continue; + personas = folks_individual_get_personas (individual); - persona_count++; - if (persona_count >= 2) - break; - } + if (priv->show_uninteresting) + { + persona_count = gee_collection_get_size (GEE_COLLECTION (personas)); + } + else + { + GeeIterator *iter; - if (persona_count < 2) + iter = gee_iterable_iterator (GEE_ITERABLE (personas)); + while (persona_count < 2 && gee_iterator_next (iter)) { - /* Not a meta-contact */ - text = - g_strdup_printf ( - _("Do you really want to remove the contact '%s'?"), - folks_aliasable_get_alias (FOLKS_ALIASABLE (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_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + FolksPersona *persona = gee_iterator_get (iter); + + if (empathy_folks_persona_is_interesting (persona)) + persona_count++; + + g_clear_object (&persona); } + g_clear_object (&iter); + } - parent = empathy_get_toplevel_window (GTK_WIDGET (view)); + /* 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. */ + + 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))); + } - if (individual_view_remove_dialog_show (parent, _("Removing contact"), - text)) + + 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) { - EmpathyIndividualManager *manager; + if (!empathy_block_individual_dialog_show (parent, individual, + avatar, &abusive)) + goto finally; - manager = empathy_individual_manager_dup_singleton (); - empathy_individual_manager_remove (manager, individual, ""); - g_object_unref (G_OBJECT (manager)); + empathy_individual_manager_set_blocked (manager, individual, + TRUE, abusive); } - g_free (text); + 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); } } @@ -2454,33 +2559,44 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view) GtkWidget *item; GtkWidget *image; gboolean can_remove = FALSE; - GList *l; + GeeSet *personas; + GeeIterator *iter; 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 (!empathy_folks_individual_contains_contact (individual)) + goto out; + /* 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) + personas = folks_individual_get_personas (individual); + iter = gee_iterable_iterator (GEE_ITERABLE (personas)); + while (!can_remove && gee_iterator_next (iter)) { - FolksPersona *persona = FOLKS_PERSONA (l->data); + FolksPersona *persona = gee_iterator_get (iter); 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; - } + can_remove = TRUE; + + g_clear_object (&persona); } + g_clear_object (&iter); - menu = empathy_individual_menu_new (individual, priv->individual_features); + menu = empathy_individual_menu_new (individual, priv->individual_features, + priv->store); /* Remove contact */ if ((priv->view_features & @@ -2514,6 +2630,7 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view) g_signal_connect (menu, "link-contacts-activated", (GCallback) individual_menu_link_contacts_activated_cb, view); +out: g_object_unref (individual); return menu; @@ -2653,11 +2770,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *self, /* 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); @@ -2684,13 +2796,6 @@ empathy_individual_view_set_store (EmpathyIndividualView *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); } } @@ -2707,3 +2812,55 @@ empathy_individual_view_start_search (EmpathyIndividualView *self) else gtk_widget_show (GTK_WIDGET (priv->search_widget)); } + +void +empathy_individual_view_set_custom_filter (EmpathyIndividualView *self, + GtkTreeModelFilterVisibleFunc filter, + gpointer data) +{ + EmpathyIndividualViewPriv *priv = GET_PRIV (self); + + 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); +}