X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=d23911c3f5f407d6d31fc9c5d7844df73b5f920b;hp=e89c113b2096a579521dcd52b1cc1943920842bd;hb=ab7897cf6b9f693a7ef988980b8cd77fa7e6a56c;hpb=cb62d4b17541a53adccdc209a5dc0b09ba2ab8a8 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index e89c113..d23911c 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -61,6 +62,7 @@ #include "modest-dnd.h" #include "modest-ui-constants.h" #include "widgets/modest-window.h" +#include /* Folder view drag types */ const GtkTargetEntry folder_view_drag_types[] = @@ -195,11 +197,19 @@ static gboolean get_inner_models (ModestFolderView *self, GtkTreeModel **filter_model, GtkTreeModel **sort_model, GtkTreeModel **tny_model); +#ifdef MODEST_TOOLKIT_HILDON2 +static void +on_activity_changed (TnyGtkFolderListStore *store, + gboolean activity, + ModestFolderView *folder_view); +#endif enum { FOLDER_SELECTION_CHANGED_SIGNAL, FOLDER_DISPLAY_NAME_CHANGED_SIGNAL, FOLDER_ACTIVATED_SIGNAL, + VISIBLE_ACCOUNT_CHANGED_SIGNAL, + ACTIVITY_CHANGED_SIGNAL, LAST_SIGNAL }; @@ -230,8 +240,10 @@ struct _ModestFolderViewPrivate { gchar *local_account_name; gchar *visible_account_id; + gchar *mailbox; ModestFolderViewStyle style; ModestFolderViewCellStyle cell_style; + gboolean show_message_count; gboolean reselect; /* we use this to force a reselection of the INBOX */ gboolean show_non_move; @@ -241,6 +253,9 @@ struct _ModestFolderViewPrivate { GtkCellRenderer *messages_renderer; gulong outbox_deleted_handler; + + guint activity_changed_handler; + gboolean activity; }; #define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -338,6 +353,32 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + /* + * Emitted whenever the visible account changes + */ + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("visible-account-changed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestFolderViewClass, + visible_account_changed), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + + /* + * Emitted when the underlying GtkListStore is updating data + */ + signals[ACTIVITY_CHANGED_SIGNAL] = + g_signal_new ("activity-changed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestFolderViewClass, + activity_changed), + NULL, NULL, + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + treeview_class->select_cursor_parent = NULL; #ifdef MODEST_TOOLKIT_HILDON2 @@ -359,7 +400,7 @@ get_inner_models (ModestFolderView *self, f_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!GTK_IS_TREE_MODEL_FILTER(f_model)) { - g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + g_debug ("%s: emtpy model or not filter model", __FUNCTION__); return FALSE; } @@ -503,6 +544,7 @@ convert_parent_folders_to_dots (gchar **item_name) static void format_compact_style (gchar **item_name, GObject *instance, + const gchar *mailbox, gboolean bold, gboolean multiaccount, gboolean *use_markup) @@ -519,6 +561,26 @@ format_compact_style (gchar **item_name, folder_type = tny_folder_get_folder_type (folder); is_special = (get_cmp_pos (folder_type, folder)!= 4); + if (mailbox) { + /* Remove mailbox prefix if any */ + gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL); + if (g_str_has_prefix (*item_name, prefix)) { + gchar *new_item_name; + + new_item_name = g_strdup (*item_name + strlen (prefix)); + if (!g_ascii_strcasecmp (new_item_name, "Inbox")) { + g_free (new_item_name); + new_item_name = g_strdup (_("mcen_me_folder_inbox")); + } + g_free (*item_name); + *item_name = new_item_name; + } + } else if (!g_ascii_strcasecmp (*item_name, "Inbox")) { + + g_free (*item_name); + *item_name = g_strdup (_("mcen_me_folder_inbox")); + } + if (!is_special || multiaccount) { TnyAccount *account = tny_folder_get_account (folder); const gchar *folder_name; @@ -630,7 +692,11 @@ text_cell_data (GtkTreeViewColumn *column, } else { /* Use bold font style if there are unread or unset messages */ if (number > 0) { - item_name = g_strdup_printf ("%s (%d)", fname, number); + if (priv->show_message_count) { + item_name = g_strdup_printf ("%s (%d)", fname, number); + } else { + item_name = g_strdup (fname); + } item_weight = 800; } else { item_name = g_strdup (fname); @@ -664,7 +730,7 @@ text_cell_data (GtkTreeViewColumn *column, multiaccount = (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); /* Convert item_name to markup */ - format_compact_style (&item_name, instance, + format_compact_style (&item_name, instance, priv->mailbox, item_weight == 800, multiaccount, &use_markup); } @@ -852,9 +918,44 @@ get_composite_icons (const gchar *icon_code, return retval; } +static inline ThreePixbufs * +get_account_protocol_pixbufs (ModestFolderView *folder_view, + ModestProtocolType protocol_type, + GObject *object) +{ + ModestProtocol *protocol; + const GdkPixbuf *pixbuf = NULL; + ModestFolderViewPrivate *priv; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); + + protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + protocol_type); + + if (MODEST_IS_ACCOUNT_PROTOCOL (protocol)) { + pixbuf = modest_account_protocol_get_icon (MODEST_ACCOUNT_PROTOCOL (protocol), + priv->filter & MODEST_FOLDER_VIEW_FILTER_SHOW_ONLY_MAILBOXES? + MODEST_ACCOUNT_PROTOCOL_ICON_MAILBOX: + MODEST_ACCOUNT_PROTOCOL_ICON_FOLDER, + object, FOLDER_ICON_SIZE); + } + + if (pixbuf) { + ThreePixbufs *retval; + retval = g_slice_new0 (ThreePixbufs); + retval->pixbuf = g_object_ref ((GObject *) pixbuf); + retval->pixbuf_open = g_object_ref ((GObject *) pixbuf); + retval->pixbuf_close = g_object_ref ((GObject *) pixbuf); + return retval; + } else { + return NULL; + } +} + static inline ThreePixbufs* -get_folder_icons (TnyFolderType type, GObject *instance) +get_folder_icons (ModestFolderView *folder_view, TnyFolderType type, GObject *instance) { + TnyAccount *account = NULL; static GdkPixbuf *inbox_pixbuf = NULL, *outbox_pixbuf = NULL, *junk_pixbuf = NULL, *sent_pixbuf = NULL, *trash_pixbuf = NULL, *draft_pixbuf = NULL, @@ -875,6 +976,23 @@ get_folder_icons (TnyFolderType type, GObject *instance) ThreePixbufs *retval = NULL; + if (TNY_IS_ACCOUNT (instance)) { + account = g_object_ref (instance); + } else if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) { + account = tny_folder_get_account (TNY_FOLDER (instance)); + } + + if (account) { + ModestProtocolType account_store_protocol; + + account_store_protocol = modest_tny_account_get_protocol_type (account); + retval = get_account_protocol_pixbufs (folder_view, account_store_protocol, instance); + g_object_unref (account); + } + + if (retval) + return retval; + /* Sometimes an special folder is reported by the server as NORMAL, like some versions of Dovecot */ if (type == TNY_FOLDER_TYPE_NORMAL || @@ -1023,6 +1141,7 @@ icon_cell_data (GtkTreeViewColumn *column, TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; gboolean has_children; ThreePixbufs *pixbufs; + ModestFolderView *folder_view = (ModestFolderView *) data; rendobj = (GObject *) renderer; @@ -1035,7 +1154,7 @@ icon_cell_data (GtkTreeViewColumn *column, return; has_children = gtk_tree_model_iter_has_child (tree_model, iter); - pixbufs = get_folder_icons (type, instance); + pixbufs = get_folder_icons (folder_view, type, instance); g_object_unref (instance); /* Set pixbuf */ @@ -1079,6 +1198,7 @@ add_columns (GtkWidget *treeview) #ifdef MODEST_TOOLKIT_HILDON2 "ellipsize", PANGO_ELLIPSIZE_MIDDLE, "ypad", MODEST_MARGIN_DEFAULT, + "xpad", MODEST_MARGIN_DEFAULT, #else "ellipsize", PANGO_ELLIPSIZE_END, #endif @@ -1134,9 +1254,12 @@ modest_folder_view_init (ModestFolderView *obj) priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL; priv->cur_folder_store = NULL; priv->visible_account_id = NULL; + priv->mailbox = NULL; priv->folder_to_select = NULL; priv->outbox_deleted_handler = 0; priv->reexpand = TRUE; + priv->activity = FALSE; + priv->activity_changed_handler = 0; /* Initialize the local account name */ conf = modest_runtime_get_conf(); @@ -1150,6 +1273,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->reselect = FALSE; priv->show_non_move = TRUE; priv->list_to_move = NULL; + priv->show_message_count = TRUE; /* Build treeview */ add_columns (GTK_WIDGET (obj)); @@ -1251,6 +1375,7 @@ modest_folder_view_finalize (GObject *obj) g_free (priv->local_account_name); g_free (priv->visible_account_id); + g_free (priv->mailbox); if (priv->conf_key_signal) { g_signal_handler_disconnect (modest_runtime_get_conf (), @@ -1562,6 +1687,7 @@ on_account_removed (TnyAccountStore *account_store, /* Clear the current visible account_id */ modest_folder_view_set_account_id_of_visible_server_account (self, NULL); + modest_folder_view_set_mailbox (self, NULL); /* Call the restore method, this will set the new visible account */ modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self), @@ -1681,13 +1807,102 @@ expand_root_items (ModestFolderView *self) static gboolean is_parent_of (TnyFolder *a, TnyFolder *b) { - return FALSE; + const gchar *a_id; + gboolean retval = FALSE; + + a_id = tny_folder_get_id (a); + if (a_id) { + gchar *string_to_match; + const gchar *b_id; + + string_to_match = g_strconcat (a_id, "/", NULL); + b_id = tny_folder_get_id (b); + retval = g_str_has_prefix (b_id, string_to_match); + g_free (string_to_match); + } + + return retval; } +typedef struct _ForeachFolderInfo { + gchar *needle; + gboolean found; +} ForeachFolderInfo; + +static gboolean +foreach_folder_with_id (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + ForeachFolderInfo *info; + GObject *instance; + + info = (ForeachFolderInfo *) data; + gtk_tree_model_get (model, iter, + INSTANCE_COLUMN, &instance, + -1); + + if (TNY_IS_FOLDER (instance)) { + const gchar *id; + gchar *collate; + id = tny_folder_get_id (TNY_FOLDER (instance)); + if (id) { + collate = g_utf8_collate_key (id, -1); + info->found = !strcmp (info->needle, collate); + g_free (collate); + } + } + + if (instance) + g_object_unref (instance); + + return info->found; + +} + + static gboolean -has_child_with_name_of (TnyFolder *a, TnyFolder *b) +has_folder_with_id (ModestFolderView *self, const gchar *id) { - return FALSE; + GtkTreeModel *model; + ForeachFolderInfo info = {NULL, FALSE}; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + info.needle = g_utf8_collate_key (id, -1); + + gtk_tree_model_foreach (model, foreach_folder_with_id, &info); + g_free (info.needle); + + return info.found; +} + +static gboolean +has_child_with_name_of (ModestFolderView *self, TnyFolder *a, TnyFolder *b) +{ + const gchar *a_id; + gboolean retval = FALSE; + + a_id = tny_folder_get_id (a); + if (a_id) { + const gchar *b_id; + b_id = tny_folder_get_id (b); + + if (b_id) { + const gchar *last_bar; + gchar *string_to_match; + last_bar = g_strrstr (b_id, "/"); + if (last_bar) + last_bar++; + else + last_bar = b_id; + string_to_match = g_strconcat (a_id, "/", last_bar, NULL); + retval = has_folder_with_id (self, string_to_match); + g_free (string_to_match); + } + } + + return retval; } static gboolean @@ -1710,11 +1925,12 @@ check_move_to_this_folder_valid (ModestFolderView *self, TnyFolder *folder) } else if (TNY_IS_FOLDER (instance)) { retval = !is_parent_of (TNY_FOLDER (instance), folder); if (retval) { - retval = !has_child_with_name_of (folder, TNY_FOLDER (instance)); + retval = !has_child_with_name_of (self, folder, TNY_FOLDER (instance)); } } g_object_unref (instance); } + g_object_unref (iterator); return retval; } @@ -1737,11 +1953,13 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) gboolean found = FALSE; gboolean cleared = FALSE; ModestTnyFolderRules rules = 0; + gchar *fname; g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data); gtk_tree_model_get (model, iter, + NAME_COLUMN, &fname, TYPE_COLUMN, &type, INSTANCE_COLUMN, &instance, -1); @@ -1750,8 +1968,10 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) happen when the model is being modified while it's being drawn. This could occur for example when moving folders using drag&drop */ - if (!instance) + if (!instance) { + g_free (fname); return FALSE; + } if (TNY_IS_ACCOUNT (instance)) { TnyAccount *acc = TNY_ACCOUNT (instance); @@ -1791,8 +2011,17 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { /* Show only the visible account id */ if (priv->visible_account_id) { - if (strcmp (account_id, priv->visible_account_id)) - retval = FALSE; + if (strcmp (account_id, priv->visible_account_id)) { + retval = FALSE; + } else if (priv->mailbox) { + /* Filter mailboxes */ + if (!g_str_has_prefix (fname, priv->mailbox)) { + retval = FALSE; + } else if (!strcmp (fname, priv->mailbox)) { + /* Hide mailbox parent */ + retval = FALSE; + } + } } } g_object_unref (account); @@ -1816,7 +2045,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) /* If this is a move to dialog, hide Sent, Outbox and Drafts folder as no message can be move there according to UI specs */ - if (!priv->show_non_move) { + if (retval && !priv->show_non_move) { if (priv->list_to_move && tny_list_get_length (priv->list_to_move) > 0 && TNY_IS_FOLDER (instance)) { @@ -1845,6 +2074,16 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) break; } } + if (retval && TNY_IS_ACCOUNT (instance) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) { + ModestProtocolType protocol_type; + + protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance)); + retval = !modest_protocol_registry_protocol_type_has_tag + (modest_runtime_get_protocol_registry (), + protocol_type, + MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD); + } } /* apply special filters */ @@ -1853,6 +2092,45 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) return FALSE; } + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS)) { + if (TNY_IS_FOLDER (instance)) + return FALSE; + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS)) { + if (TNY_IS_ACCOUNT (instance)) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) + return FALSE; + } else if (TNY_IS_FOLDER (instance)) { + if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) + return FALSE; + } + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS)) { + if (TNY_IS_ACCOUNT (instance)) { + if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) + return FALSE; + } else if (TNY_IS_FOLDER (instance)) { + if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) + return FALSE; + } + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_SHOW_ONLY_MAILBOXES)) { + /* A mailbox is a fake folder with an @ in the middle of the name */ + if (!TNY_IS_FOLDER (instance) || + !(tny_folder_get_caps (TNY_FOLDER (instance)) & TNY_FOLDER_CAPS_NOSELECT)) { + return FALSE; + } else { + const gchar *folder_name; + folder_name = tny_folder_get_name (TNY_FOLDER (instance)); + if (!folder_name || strchr (folder_name, '@') == NULL) + return FALSE; + } + + } + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS)) { if (TNY_IS_FOLDER (instance)) { /* Check folder rules */ @@ -1929,6 +2207,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) /* Free */ g_object_unref (instance); + g_free (fname); return retval; } @@ -1939,7 +2218,7 @@ modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) { ModestFolderViewPrivate *priv; - GtkTreeModel *model /* , *old_model */; + GtkTreeModel *model; GtkTreeModel *filter_model = NULL, *sortable = NULL; g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE); @@ -2013,6 +2292,15 @@ modest_folder_view_update_model (ModestFolderView *self, self, NULL); + if (priv->activity_changed_handler > 0) { + GtkTreeModel *old_tny_model; + + if (get_inner_models (self, NULL, NULL, &old_tny_model)) { + g_signal_handler_disconnect (G_OBJECT (old_tny_model), priv->activity_changed_handler); + } + priv->activity_changed_handler = 0; + } + /* Set new model */ gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model); #ifndef MODEST_TOOLKIT_HILDON2 @@ -2020,6 +2308,12 @@ modest_folder_view_update_model (ModestFolderView *self, (GCallback) on_row_inserted_maybe_select_folder, self); #endif +#ifdef MODEST_TOOLKIT_HILDON2 + priv->activity_changed_handler = + g_signal_connect (G_OBJECT (model), "activity-changed", G_CALLBACK (on_activity_changed), self); +#endif + priv->activity = FALSE; + g_object_unref (model); g_object_unref (filter_model); g_object_unref (sortable); @@ -3182,6 +3476,11 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s /* Save settings to gconf */ modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self), MODEST_CONF_FOLDER_VIEW_KEY); + + /* Notify observers */ + g_signal_emit (G_OBJECT(self), + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0, + account_id); } const gchar * @@ -3232,6 +3531,7 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter void modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) { +#ifndef MODEST_TOOLKIT_HILDON2 GtkTreeModel *model; GtkTreeIter iter, inbox_iter; GtkTreeSelection *sel; @@ -3263,6 +3563,7 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) /* set focus */ gtk_widget_grab_focus (GTK_WIDGET(self)); +#endif } @@ -3475,11 +3776,22 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, GtkTreeModel *filter_model = NULL; GtkTreeModel *model = NULL; GtkTreeModel *new_filter_model = NULL; + GtkTreeModel *old_tny_model = NULL; + GtkTreeModel *new_tny_model = NULL; + ModestFolderViewPrivate *dst_priv; g_return_if_fail (folder_view_src && MODEST_IS_FOLDER_VIEW (folder_view_src)); g_return_if_fail (folder_view_dst && MODEST_IS_FOLDER_VIEW (folder_view_dst)); + dst_priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view_dst); + if (!get_inner_models (folder_view_src, NULL, NULL, &new_tny_model)) + new_tny_model = NULL; + /* Get src model*/ + if (get_inner_models (folder_view_dst, NULL, NULL, &old_tny_model)) { + g_signal_handler_disconnect (G_OBJECT (old_tny_model), dst_priv->activity_changed_handler); + dst_priv->activity_changed_handler = 0; + } filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src)); model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model)); @@ -3489,12 +3801,21 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, filter_row, folder_view_dst, NULL); + + + /* Set copied model */ gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model); #ifndef MODEST_TOOLKIT_HILDON2 g_signal_connect (G_OBJECT(new_filter_model), "row-inserted", (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst); #endif +#ifdef MODEST_TOOLKIT_HILDON2 + if (new_tny_model) + dst_priv->activity_changed_handler = g_signal_connect (G_OBJECT (new_tny_model), "activity-changed", + G_CALLBACK (on_activity_changed), folder_view_dst); +#endif + dst_priv->activity = FALSE; /* Free */ g_object_unref (new_filter_model); @@ -3521,6 +3842,22 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, } } +void +modest_folder_view_show_message_count (ModestFolderView *folder_view, + gboolean show) +{ + ModestFolderViewPrivate* priv; + + g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view)); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + priv->show_message_count = show; + + g_object_set (G_OBJECT (priv->messages_renderer), + "visible", (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && priv->show_message_count), + NULL); +} + /* Returns FALSE if it did not selected anything */ static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, @@ -3599,7 +3936,7 @@ modest_folder_view_set_cell_style (ModestFolderView *self, priv->cell_style = cell_style; g_object_set (G_OBJECT (priv->messages_renderer), - "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT), + "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && priv->show_message_count), NULL); gtk_widget_queue_draw (GTK_WIDGET (self)); @@ -3740,3 +4077,63 @@ modest_folder_view_set_list_to_move (ModestFolderView *self, priv->list_to_move = list; } + +void +modest_folder_view_set_mailbox (ModestFolderView *self, const gchar *mailbox) +{ + ModestFolderViewPrivate *priv; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->mailbox) + g_free (priv->mailbox); + + priv->mailbox = g_strdup (mailbox); + + /* Notify observers */ + g_signal_emit (G_OBJECT(self), + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0, + priv->visible_account_id); +} + +const gchar * +modest_folder_view_get_mailbox (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + return (const gchar *) priv->mailbox; +} + +gboolean +modest_folder_view_get_activity (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + return priv->activity; +} + +#ifdef MODEST_TOOLKIT_HILDON2 +static void +on_activity_changed (TnyGtkFolderListStore *store, + gboolean activity, + ModestFolderView *folder_view) +{ + ModestFolderViewPrivate *priv; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + g_return_if_fail (TNY_IS_GTK_FOLDER_LIST_STORE (store)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); + + priv->activity = activity; + + g_signal_emit (G_OBJECT (folder_view), signals[ACTIVITY_CHANGED_SIGNAL], 0, + activity); +} +#endif