static void modest_folder_view_set_account_store (TnyAccountStoreView *self,
TnyAccountStore *account_store);
-static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
+static void on_selection_changed (GtkTreeSelection *sel,
+ gpointer data);
static void on_account_removed (TnyAccountStore *self,
TnyAccount *account,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
-
if (!fname)
return;
if (!normal_pixbuf_open) {
GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf);
- gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0,
+ gdk_pixbuf_composite (emblem, normal_pixbuf_open, 0, 0,
MIN (gdk_pixbuf_get_width (emblem),
gdk_pixbuf_get_width (normal_pixbuf_open)),
MIN (gdk_pixbuf_get_height (emblem),
TnyAccount *tny_account,
gpointer user_data)
{
- /* do nothing */
ModestFolderViewPrivate *priv;
GtkTreeModel *sort_model, *filter_model;
/* Get the inner model */
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
-
+
/* Remove the account from the model */
tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
G_OBJECT (tny_account));
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
}
+/**
+ *
+ * Selects the first inbox or the local account in an idle
+ */
+static gboolean
+on_idle_select_first_inbox_or_local (gpointer user_data)
+{
+ ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+
+ modest_folder_view_select_first_inbox_or_local (self);
+
+ return FALSE;
+}
static void
/* Select the first INBOX if the currently selected folder
belongs to the account that is being deleted */
if (same_account_selected)
- modest_folder_view_select_first_inbox_or_local (self);
+ g_idle_add (on_idle_select_first_inbox_or_local, self);
}
void
{
GtkTreeViewColumn *col;
- g_return_if_fail (self);
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
if (!col) {
* account in this case, and the local folders.
*/
static gboolean
-filter_row (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
+filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
{
ModestFolderViewPrivate *priv;
gboolean retval = TRUE;
GtkTreeModel *model /* , *old_model */;
GtkTreeModel *filter_model = NULL, *sortable = NULL;
- g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
- g_return_val_if_fail (account_store, FALSE);
-
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+ g_return_val_if_fail (account_store && MODEST_IS_TNY_ACCOUNT_STORE(account_store),
+ FALSE);
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
/* Notify that there is no folder selected */
modest_folder_view_get_selected (ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
-
- g_return_val_if_fail (self, NULL);
+
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
if (priv->cur_folder_store)
* source for dnd after the event drop happened
*/
static void
-on_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
- gpointer data)
+on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
+ guint info, guint time, gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *source_row;
-
+
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
}
/* Connect to source folder and perform the copy/move */
- modest_platform_connect_and_perform_if_network_folderstore (NULL,
+ modest_platform_connect_if_remote_and_perform (NULL,
info->src_folder,
drag_and_drop_from_folder_view_src_folder_performer,
info);
info->helper = helper;
/* Connect to the destination folder and perform the copy/move */
- modest_platform_connect_and_perform_if_network_folderstore (GTK_WINDOW (win),
+ modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win),
dest_folder,
drag_and_drop_from_folder_view_dst_folder_performer,
info);
ModestFolderViewPrivate *priv;
GdkDragAction suggested_action;
gboolean valid_location = FALSE;
- TnyFolderStore *folder;
+ TnyFolderStore *folder = NULL;
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
goto out;
}
}
- g_object_unref (folder);
/* Expand the selected row after 1/2 second */
if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) {
gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
out:
+ if (folder)
+ g_object_unref (folder);
if (dest_row)
gtk_tree_path_free (dest_row);
g_signal_stop_emission_by_name (widget, "drag-motion");
{
ModestFolderViewPrivate *priv;
- g_return_if_fail (self);
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+ g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL ||
+ style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
priv->style = style;
}
ModestFolderViewPrivate *priv;
GtkTreeModel *model;
- g_return_if_fail (self);
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
{
ModestFolderViewPrivate *priv;
- g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
GtkTreeSelection *sel;
GtkTreePath *path = NULL;
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
if (!model)
return;
modest_folder_view_disable_next_folder_selection (self);
/* g_object_unref (priv->folder_to_select); */
/* priv->folder_to_select = NULL; */
+
+ /* Refilter the model */
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
}
}
void
modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
{
- ModestFolderViewPrivate *priv = NULL;
+ ModestFolderViewPrivate *priv;
+
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
if (priv->folder_to_select)
GtkTreeSelection *sel;
ModestFolderViewPrivate *priv = NULL;
- g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
- g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+ g_return_val_if_fail (folder && TNY_IS_FOLDER (folder), FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
if (after_change) {
-
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
gtk_tree_selection_unselect_all (sel);
void
-modest_folder_view_copy_selection (ModestFolderView *folder_view)
+modest_folder_view_copy_selection (ModestFolderView *self)
{
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
/* Copy selection */
- _clipboard_set_selected_data (folder_view, FALSE);
+ _clipboard_set_selected_data (self, FALSE);
}
void
const gchar **hidding = NULL;
guint i, n_selected;
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+ g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
/* Copy selection */
GtkTreeModel *model = NULL;
GtkTreeModel *new_filter_model = NULL;
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src));
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst));
-
+ 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));
+
/* Get src model*/
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));
gboolean show)
{
GtkTreeModel *model = NULL;
- ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+ ModestFolderViewPrivate* priv;
+
+ g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
priv->show_non_move = show;
/* modest_folder_view_update_model(folder_view, */
/* TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); */