#include <tny-folder-monitor.h>
#include <tny-folder-change.h>
#include <tny-error.h>
+#include <tny-merge-folder.h>
#include <string.h>
#include <modest-header-view.h>
GtkCellRenderer *renderer_subject;
GtkCellRenderer *renderer_address;
GtkCellRenderer *renderer_date_status;
+
+ GdkColor active_color;
+ GdkColor secondary_color;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
}
static void
-modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_set_folder_intern (ModestHeaderView *self,
+ TnyFolder *folder,
+ gboolean refresh)
{
TnyFolderType type;
TnyList *headers;
be added again by tny_gtk_header_list_model_set_folder, so
we'd end up with duplicate headers. sergio */
tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
- folder, FALSE,
+ folder, refresh,
set_folder_intern_get_headers_async_cb,
NULL, self);
ModestMailOperation *mail_op = NULL;
/* Set folder in the model */
- modest_header_view_set_folder_intern (self, folder);
+ modest_header_view_set_folder_intern (self, folder, refresh);
/* Pick my reference. Nothing to do with the mail operation */
priv->folder = g_object_ref (folder);
gint t1, t2;
gchar *val1, *val2;
gint cmp;
-/* static int counter = 0; */
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &val2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
- cmp = modest_text_utils_utf8_strcmp (val1 + modest_text_utils_get_subject_prefix_len(val1),
- val2 + modest_text_utils_get_subject_prefix_len(val2),
+ /* Do not use the prefixes for sorting. Consume all the blank
+ spaces for sorting */
+ cmp = modest_text_utils_utf8_strcmp (g_strchug (val1 + modest_text_utils_get_subject_prefix_len(val1)),
+ g_strchug (val2 + modest_text_utils_get_subject_prefix_len(val2)),
TRUE);
+
+ /* If they're equal based on subject without prefix then just
+ sort them by length. This will show messages like this.
+ * Fw:
+ * Fw:Fw:
+ * Fw:Fw:
+ * Fw:Fw:Fw:
+ * */
+ if (cmp == 0)
+ cmp = (g_utf8_strlen (val1, -1) >= g_utf8_strlen (val2, -1)) ? 1 : -1;
+
g_free (val1);
g_free (val2);
return cmp;
}
static gboolean
+current_folder_needs_filtering (ModestHeaderViewPrivate *priv)
+{
+ /* For the moment we only need to filter outbox */
+ return priv->is_outbox;
+}
+
+static gboolean
filter_row (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer user_data)
}
if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
- if (priv->is_outbox &&
+ if (current_folder_needs_filtering (priv) &&
modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
visible = FALSE;
goto frees;
}
if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
- if (priv->is_outbox &&
+ if (current_folder_needs_filtering (priv) &&
modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
visible = FALSE;
goto frees;
void
modest_header_view_refilter (ModestHeaderView *header_view)
{
- GtkTreeModel *model = NULL;
+ GtkTreeModel *model, *sortable = NULL;
ModestHeaderViewPrivate *priv = NULL;
g_return_if_fail (header_view && MODEST_IS_HEADER_VIEW (header_view));
priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
/* Hide cut headers */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_FILTER (model)) {
- priv->status = HEADER_VIEW_INIT;
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ if (GTK_IS_TREE_MODEL_SORT (sortable)) {
+ model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sortable));
+ if (GTK_IS_TREE_MODEL_FILTER (model)) {
+ priv->status = HEADER_VIEW_INIT;
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ }
}
}
if (priv->folder) {
TnyAccount *my_account;
- my_account = tny_folder_get_account (priv->folder);
- if (my_account == account)
- modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
- g_object_unref (my_account);
+ if (TNY_IS_MERGE_FOLDER (priv->folder) &&
+ tny_folder_get_folder_type (priv->folder) == TNY_FOLDER_TYPE_OUTBOX) {
+ ModestTnyAccountStore *acc_store = modest_runtime_get_account_store ();
+ my_account = modest_tny_account_store_get_local_folders_account (acc_store);
+ } else {
+ my_account = tny_folder_get_account (priv->folder);
+ }
+
+ if (my_account) {
+ if (my_account == account)
+ modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
+ g_object_unref (my_account);
+ }
}
}
ModestHeaderViewFilter filter)
{
ModestHeaderViewPrivate *priv;
- GtkTreeModel *filter_model;
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
priv->filter |= filter;
- filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
- if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
- }
+ if (current_folder_needs_filtering (priv))
+ modest_header_view_refilter (self);
}
void
ModestHeaderViewFilter filter)
{
ModestHeaderViewPrivate *priv;
- GtkTreeModel *filter_model;
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
priv->filter &= ~filter;
- filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
- if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
- }
+ if (current_folder_needs_filtering (priv))
+ modest_header_view_refilter (self);
}
static void
PangoAttrList *attr_list;
GtkStyle *style;
PangoAttribute *attr;
- GdkColor *new_color;
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
gdk_color_parse ("grey", &style_color);
}
+ priv->secondary_color = style_color;
attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
pango_attr_list_insert (attr_list, attr);
pango_attr_list_insert (attr_list, attr);
g_object_set (G_OBJECT (priv->renderer_address),
- "foreground-gdk", &style_color,
+ "foreground-gdk", &(priv->secondary_color),
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
- "foreground-gdk", &style_color,
+ "foreground-gdk", &(priv->secondary_color),
"foreground-set", TRUE,
"attributes", attr_list,
NULL);
pango_attr_list_unref (attr_list);
} else {
g_object_set (G_OBJECT (priv->renderer_address),
- "foreground-gdk", &style_color,
+ "foreground-gdk", &(priv->secondary_color),
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
NULL);
g_object_set (G_OBJECT (priv->renderer_date_status),
- "foreground-gdk", &style_color,
+ "foreground-gdk", &(priv->secondary_color),
"foreground-set", TRUE,
"scale", PANGO_SCALE_SMALL,
"scale-set", TRUE,
}
if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
- new_color = gdk_color_copy (&style_active_color);
+ priv->active_color = style_active_color;
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (TRUE));
+ g_object_set_data (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, &(priv->active_color));
+#endif
} else {
- new_color = NULL;
- }
#ifdef MODEST_TOOLKIT_HILDON2
- g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (new_color != NULL));
- g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free);
+ g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (FALSE));
#endif
+ }
}
TnyHeader *
NULL))
return NULL;
- g_debug ("located path: %s", gtk_tree_path_to_string (path));
-
/* Get model */
tree_model = gtk_tree_view_get_model ((GtkTreeView *) header_view);
if (!gtk_tree_model_get_iter (tree_model, &iter, path))
projects / modest / blobdiff