evolution-data-server r10097 - trunk/camel/providers/nntp

[mcrha svn gnome org]

Author: mcrha
Date: Wed Feb 25 11:17:34 2009
New Revision: 10097
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10097&view=rev

Log:
2009-02-25  Milan Crha  <mcrha redhat com>

	** Fix for bug #572268

	* camel-nntp-store.c: (nntp_store_get_cached_folder_info):
	Do not create duplicate folder infos.



Modified:
   trunk/camel/providers/nntp/ChangeLog
   trunk/camel/providers/nntp/camel-nntp-store.c

Modified: trunk/camel/providers/nntp/camel-nntp-store.c
==============================================================================
--- trunk/camel/providers/nntp/camel-nntp-store.c	(original)
+++ trunk/camel/providers/nntp/camel-nntp-store.c	Wed Feb 25 11:17:34 2009
@@ -561,7 +561,7 @@
 		}
 	}
 
-	printf("store info update '%s' first '%u' last '%u'\n", line, first, last);
+	dd(printf("store info update '%s' first '%u' last '%u'\n", line, first, last));
 
 	if (si->last) {
 		if (last > si->last)
@@ -650,7 +650,7 @@
 	    root_or_flag = (orig_top == NULL || orig_top[0] == '\0') ? 1 : 0,
 	    recursive_flag = flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE;
 	CamelStoreInfo *si;
-	CamelFolderInfo *first = NULL, *last = NULL, *fi = NULL;
+	CamelFolderInfo *first = NULL, *last = NULL, *fi = NULL, *l;
 	char *tmpname;
 	char *top = g_strconcat(orig_top?orig_top:"", ".", NULL);
 	int toplen = strlen(top);
@@ -677,6 +677,9 @@
 					tmpname = g_strdup(si->path);
 					*(strchr(tmpname + toplen, '.')) = '\0';
 					fi = nntp_folder_info_from_name(store, FALSE, tmpname);
+					if (!fi)
+						continue;
+
 					fi->flags |= CAMEL_FOLDER_NOSELECT;
 					if (store->folder_hierarchy_relative) {
 						g_free(fi->name);
@@ -687,6 +690,20 @@
 					continue;
 				}
 			}
+
+			for (l = first; l; l = l->next) {
+				if (l->full_name && fi->full_name && g_str_equal (l->full_name, fi->full_name)) {
+					/* it's there already, do not add it twice */
+					camel_folder_info_free (fi);
+					break;
+				}
+			}
+
+			if (l) {
+				/* a duplicate has been found above */
+				continue;
+			}
+
 			if (last)
 				last->next = fi;
 			else