static void modest_folder_view_set_account_store (TnyAccountStoreView *self,
TnyAccountStore *account_store);
-static gboolean update_model (ModestFolderView *self,
- ModestTnyAccountStore *account_store);
-
static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
static void on_account_update (TnyAccountStore *account_store,
ModestFolderViewPrivate *priv;
GObject *rendobj;
gchar *fname = NULL;
- gint unread, all;
- TnyFolderType type;
+ gint unread = 0;
+ gint all = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
g_return_if_fail (column);
gint number = 0;
if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
- TnyFolderType type;
- type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
- if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+ TnyFolderType folder_type
+ = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
+ if (folder_type != TNY_FOLDER_TYPE_UNKNOWN) {
g_free (fname);
- fname = g_strdup(modest_local_folder_info_get_type_display_name (type));
+ fname = g_strdup(modest_local_folder_info_get_type_display_name (folder_type));
}
}
{
GObject *rendobj = NULL, *instance = NULL;
GdkPixbuf *pixbuf = NULL;
- TnyFolderType type;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
gchar *fname = NULL;
const gchar *account_id = NULL;
- gint unread;
+ gint unread = 0;
rendobj = G_OBJECT(renderer);
gtk_tree_model_get (tree_model, iter,
on_account_update (TnyAccountStore *account_store, const gchar *account,
gpointer user_data)
{
- if (!update_model (MODEST_FOLDER_VIEW(user_data),
- MODEST_TNY_ACCOUNT_STORE(account_store)))
+ if (!modest_folder_view_update_model (MODEST_FOLDER_VIEW(user_data),
+ account_store))
g_printerr ("modest: failed to update model for changes in '%s'",
account);
}
ModestConf *conf = modest_runtime_get_conf ();
modest_widget_memory_save (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
- update_model (MODEST_FOLDER_VIEW (user_data),
- MODEST_TNY_ACCOUNT_STORE(account_store));
+ modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
modest_widget_memory_restore (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
}
gpointer data)
{
gboolean retval = TRUE;
- gint type = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
gtk_tree_model_get (model, iter,
return retval;
}
-/*
-static void on_tnylist_accounts_debug_print(gpointer data, gpointer user_data)
-{
- TnyAccount* account = TNY_ACCOUNT(data);
- const gchar *prefix = (const gchar*)(user_data);
-
- printf("%s account id=%s\n", prefix, tny_account_get_id (account));
-}
-*/
-
-static gboolean
-update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
+gboolean
+modest_folder_view_update_model (ModestFolderView *self,
+ TnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
GtkTreeModel *model /* , *old_model */;
GtkTreeIter iter;
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
- gint type;
g_return_if_fail (sel);
g_return_if_fail (user_data);
tree_view = MODEST_FOLDER_VIEW (user_data);
gtk_tree_model_get (model, &iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-1);
gpointer user_data)
{
gint cmp;
- gchar *name1, *name2;
- TnyFolderType type;
+ gchar *name1 = NULL;
+ gchar *name2 = NULL;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *folder1 = NULL;
GObject *folder2 = NULL;
GtkTreePath *dest_row,
DndHelper *helper)
{
- TnyList *headers;
- TnyHeader *header;
- TnyFolder *folder;
- ModestMailOperation *mail_op;
+ TnyList *headers = NULL;
+ TnyHeader *header = NULL;
+ TnyFolder *folder = NULL;
+ ModestMailOperation *mail_op = NULL;
GtkTreeIter source_iter, dest_iter;
+ g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
+ g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
+ g_return_if_fail (dest_row);
+ g_return_if_fail (helper);
+
/* Get header */
gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
gtk_tree_model_get (source_model, &source_iter,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
&header, -1);
-
+ if (!TNY_IS_HEADER(header)) {
+ g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
+ goto cleanup;
+ }
+
/* Get Folder */
gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
gtk_tree_model_get (dest_model, &dest_iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
+ if (!TNY_IS_FOLDER(folder)) {
+ g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+ goto cleanup;
+ }
+
/* Transfer message */
mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
-
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_signal_connect (G_OBJECT (mail_op), "progress-changed",
NULL, NULL);
/* Frees */
- g_object_unref (G_OBJECT (mail_op));
- g_object_unref (G_OBJECT (header));
- g_object_unref (G_OBJECT (folder));
- g_object_unref (headers);
+cleanup:
+ if (G_IS_OBJECT(mail_op))
+ g_object_unref (G_OBJECT (mail_op));
+ if (G_IS_OBJECT(header))
+ g_object_unref (G_OBJECT (header));
+ if (G_IS_OBJECT(folder))
+ g_object_unref (G_OBJECT (folder));
+ if (G_IS_OBJECT(headers))
+ g_object_unref (headers);
}
/*
{
do {
GtkTreeIter child;
- gint type;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ gchar *name = NULL;
gtk_tree_model_get (model, iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
&type, -1);
+ /*
+ printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n",
+ __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
+ */
+
+ gboolean result = FALSE;
if (type == TNY_FOLDER_TYPE_INBOX) {
+ result = TRUE;
+ } else if (type == TNY_FOLDER_TYPE_NORMAL) {
+ /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
+ * when getting folders from the cache, before connectin, so we do
+ * an extra check. We could fix this in tinymail, but it's easier
+ * to do here.
+ */
+ if (strcmp (name, "Inbox") == 0)
+ result = TRUE;
+ }
+
+ g_free (name);
+
+ if (result) {
*inbox_iter = *iter;
return TRUE;
}
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
gtk_tree_model_get_iter_first (model, &iter);
- if (find_inbox_iter (model, &iter, &inbox_iter))
+ if (find_inbox_iter (model, &iter, &inbox_iter)) {
gtk_tree_selection_select_iter (sel, &inbox_iter);
+ }
else {
gtk_tree_model_get_iter_first (model, &iter);
gtk_tree_selection_select_iter (sel, &iter);
projects / modest / blobdiff