X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=26b5f41f47a3e4fca22d34168a8375e2426a80e3;hp=f654a4015af3b97e2eabcb20c86f3f4027c7db36;hb=HEAD;hpb=24316ebf63212f185e7f6bf70a0e04f3f52e0fa4

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index f654a40..26b5f41 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -535,34 +535,51 @@ modest_tny_folder_store_find_folder_from_uri (TnyFolderStore *folder_store, cons
 	TnyList *children;
 	TnyIterator *iterator;
 	TnyFolder *result;
+	gchar *uri_to_find, *slash;
+	gint uri_lenght;
+
+	if (uri == NULL)
+		return NULL;
+
+	slash = strrchr (uri, '/');
+	if (slash == NULL)
+		return NULL;
 
 	result = NULL;
 	children = TNY_LIST (tny_simple_list_new ());
 	tny_folder_store_get_folders (folder_store, children, NULL, FALSE, NULL);
 
+	uri_lenght = slash - uri + 1;
+	uri_to_find = g_malloc0 (sizeof(char) * uri_lenght);
+	strncpy (uri_to_find, uri, uri_lenght);
+	uri_to_find[uri_lenght - 1] = '\0';
+
 	for (iterator = tny_list_create_iterator (children);
-	     !tny_iterator_is_done (iterator) && (result == NULL);
+	     iterator && !tny_iterator_is_done (iterator) && (result == NULL);
 	     tny_iterator_next (iterator)) {
 		TnyFolderStore *child;
 
 		child = TNY_FOLDER_STORE (tny_iterator_get_current (iterator));
+		if (!child) 
+			continue;
 
 		if (TNY_IS_FOLDER (child)) {
 			gchar *folder_url;
 
 			folder_url = tny_folder_get_url_string (TNY_FOLDER (child));
-			if (g_str_has_prefix (uri, folder_url))
+			if (uri_to_find && folder_url && !strcmp (folder_url, uri_to_find))
 				result = g_object_ref (child);
 			g_free (folder_url);
 		}
 
-		if ((child == NULL) && TNY_IS_FOLDER_STORE (child)) {
+		if ((result == NULL) && TNY_IS_FOLDER_STORE (child)) {
 			result = modest_tny_folder_store_find_folder_from_uri (child, uri);
 		}
 
 		g_object_unref (child);
 	}
 
+	g_free (uri_to_find);
 	g_object_unref (iterator);
 	g_object_unref (children);