#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"
#include "empathy-cell-renderer-text.h"
#include "empathy-cell-renderer-activatable.h"
gboolean show_offline;
gboolean show_untrusted;
+ gboolean show_uninteresting;
GtkTreeModelFilter *filter;
GtkWidget *search_widget;
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
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
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);
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);
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);
* 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,
EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
GeeSet *personas;
GeeIterator *iter;
- gboolean is_favorite, contains_interesting_persona = FALSE;
+ gboolean is_favorite;
/* Always display individuals having pending events */
if (event_count > 0)
/* 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);
- iter = gee_iterable_iterator (GEE_ITERABLE (personas));
- while (!contains_interesting_persona && gee_iterator_next (iter))
+ if (!priv->show_uninteresting)
{
- FolksPersona *persona = gee_iterator_get (iter);
+ gboolean contains_interesting_persona = FALSE;
- if (empathy_folks_persona_is_interesting (persona))
- contains_interesting_persona = 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);
- g_clear_object (&persona);
- }
- g_clear_object (&iter);
+ if (empathy_folks_persona_is_interesting (persona))
+ contains_interesting_persona = TRUE;
- if (contains_interesting_persona == FALSE)
- return FALSE;
+ g_clear_object (&persona);
+ }
+ g_clear_object (&iter);
+
+ 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 */
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;
}
g_free (group);
/* show group if it has at least one visible contact in it */
- if (visible == TRUE)
+ if (visible)
return TRUE;
}
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;
"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 ();
{
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;
- GeeIterator *iter;
guint persona_count = 0;
gboolean can_block;
GError *error = NULL;
* so we still display the remove dialog. */
personas = folks_individual_get_personas (individual);
- iter = gee_iterable_iterator (GEE_ITERABLE (personas));
- /* 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. */
- while (persona_count < 2 && gee_iterator_next (iter))
+ if (priv->show_uninteresting)
{
- FolksPersona *persona = gee_iterator_get (iter);
+ persona_count = gee_collection_get_size (GEE_COLLECTION (personas));
+ }
+ else
+ {
+ GeeIterator *iter;
- if (empathy_folks_persona_is_interesting (persona))
- persona_count++;
+ iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+ while (persona_count < 2 && gee_iterator_next (iter))
+ {
+ FolksPersona *persona = gee_iterator_get (iter);
- g_clear_object (&persona);
+ if (empathy_folks_persona_is_interesting (persona))
+ persona_count++;
+
+ g_clear_object (&persona);
+ }
+ g_clear_object (&iter);
}
- g_clear_object (&iter);
+
+ /* 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)
{
}
}
-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)
{
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
}
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 &
G_CALLBACK (individual_view_remove_activate_cb), view);
}
- /* 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);
-
+out:
g_object_unref (individual);
return menu;
/* 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);
}
}
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