From: Murray Cumming <murrayc@murrayc.com>
Date: Thu, 21 Jun 2007 17:44:44 +0000 (+0000)
Subject: 2007-06-21  Murray Cumming  <murrayc@murrayc.com>
X-Git-Tag: git_migration_finished~3160
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=db10827c58f99d2f359028a65fdcf5743027bd18;p=modest

2007-06-21  Murray Cumming  <murrayc@murrayc.com>

* src/dbus_api/modest-dbus-callbacks.c: (add_folders_to_list):
Do not use a query, so that we get all folders, including for POP and
local-folders. They work as search criteria too.
This fixes projects.maemo.org bug NB#57740.

pmo-trunk-r2371
---

diff --git a/ChangeLog b/ChangeLog
index 147f81a..acb6b92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1 @@
-2007-06-21  Murray Cumming,,,  <murrayc@murrayc-desktop>
-
-	reviewed by: <delete if not using a buddy>
-
-	* src/maemo/modest-platform.c: (modest_platform_on_new_msg):
-
 * please check the svn log instead
diff --git a/ChangeLog2 b/ChangeLog2
index a8e4b72..8314ae4 100644
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,12 @@
 2007-06-21  Murray Cumming  <murrayc@murrayc.com>
 
+	* src/dbus_api/modest-dbus-callbacks.c: (add_folders_to_list):
+	Do not use a query, so that we get all folders, including for POP and 
+	local-folders. They work as search criteria too.
+	This fixes projects.maemo.org bug NB#57740.
+
+2007-06-21  Murray Cumming  <murrayc@murrayc.com>
+
 	* src/maemo/modest-platform.c: (modest_platform_on_new_msg):
 	Comment out the use of hildon_notification_set_sound() because it is 
 	not declared, to fix the build. Warnings are serious, people.
diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 1d874a9..a5c8a24 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -1159,13 +1159,15 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list)
 	/* Recurse into child folders: */
 		
 	/* Get the folders list: */
+	/*
 	TnyFolderStoreQuery *query = tny_folder_store_query_new ();
 	tny_folder_store_query_add_item (query, NULL, 
 		TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+	*/
 	TnyList *all_folders = tny_simple_list_new ();
 	tny_folder_store_get_folders (folder_store,
 				      all_folders,
-				      query,
+				      NULL /* query */,
 				      NULL /* error */);
 
 	TnyIterator *iter = tny_list_create_iterator (all_folders);