evolution r35841 - trunk/mail

[sragavan svn gnome org]

Author: sragavan
Date: Sun Jul 27 19:07:29 2008
New Revision: 35841
URL: http://svn.gnome.org/viewvc/evolution?rev=35841&view=rev

Log:
2008-07-28  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #543411

	* mail/em-folder-tree-model.c: Dont load known folders.
	* mail/em-folder-tree.c: Move iter to the last entry.


Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-tree-model.c
   trunk/mail/em-folder-tree.c

Modified: trunk/mail/em-folder-tree-model.c
==============================================================================
--- trunk/mail/em-folder-tree-model.c	(original)
+++ trunk/mail/em-folder-tree-model.c	Sun Jul 27 19:07:29 2008
@@ -448,6 +448,10 @@
 	const char *name;
 	guint32 flags;
 
+	/* make sure we don't already know about it? */
+	if (g_hash_table_lookup (si->full_hash, fi->full_name))
+		return;
+	
 	if (!fully_loaded)
 		load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
 

Modified: trunk/mail/em-folder-tree.c
==============================================================================
--- trunk/mail/em-folder-tree.c	(original)
+++ trunk/mail/em-folder-tree.c	Sun Jul 27 19:07:29 2008
@@ -1724,7 +1724,7 @@
 {
 	struct _EMFolderTreePrivate *priv = m->emft->priv;
 	struct _EMFolderTreeModelStoreInfo *si;
-	GtkTreeIter root, iter;
+	GtkTreeIter root, iter, titer;
 	CamelFolderInfo *fi;
 	GtkTreeStore *model;
 	GtkTreePath *path;
@@ -1766,6 +1766,13 @@
 	/* get the first child (which will be a dummy node) */
 	gtk_tree_model_iter_children ((GtkTreeModel *) model, &iter, &root);
 
+	/* Traverse to the last valid iter */
+	titer = iter;
+	while (gtk_tree_model_iter_next(model, &iter)) 
+		titer = iter; /* Preserve the last valid iter */
+
+	iter = titer;
+
 	/* FIXME: camel's IMAP code is totally on crack here, @top's
 	 * folder info should be @fi and fi->child should be what we
 	 * want to fill our tree with... *sigh* */