X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-local-folders-account.c;h=12ee27e294af1550c47f27b270cbb22df8af37d8;hb=6c444592d419f655429195f1e8cf87c3d3adad63;hp=ab3a2124c7599582f0071aa4710a39ba5ea294d1;hpb=9e5500bca1d9adc7b6e8d97c605a57780ce525b8;p=modest

diff --git a/src/modest-tny-local-folders-account.c b/src/modest-tny-local-folders-account.c
index ab3a212..12ee27e 100644
--- a/src/modest-tny-local-folders-account.c
+++ b/src/modest-tny-local-folders-account.c
@@ -39,6 +39,7 @@
 #include <tny-camel-folder.h>
 #include <tny-merge-folder.h>
 #include <tny-simple-list.h>
+#include <tny-gtk-lockable.h>
 
 G_DEFINE_TYPE (ModestTnyLocalFoldersAccount, 
 	modest_tny_local_folders_account, 
@@ -113,7 +114,7 @@ modest_tny_local_folders_account_query_passes (TnyFolderStoreQuery *query, TnyFo
 			TnyFolderStoreQueryItem *item = (TnyFolderStoreQueryItem*) tny_iterator_get_current (iterator);
 			if (item) {
 				TnyFolderStoreQueryOption options = tny_folder_store_query_item_get_options (item);
-				regex_t *regex = (regex_t *) tny_folder_store_query_item_get_regex (item);
+				const regex_t *regex = tny_folder_store_query_item_get_regex (item);
 
 				if ((options & TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED) &&
 			 	   tny_folder_is_subscribed (folder))
@@ -231,15 +232,11 @@ modest_tny_local_folders_account_add_folder_to_outbox (ModestTnyLocalFoldersAcco
 	g_return_if_fail (MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self));
 	g_return_if_fail (TNY_IS_FOLDER (per_account_outbox));
 
-	/* We can not test it yet, because there is no API to set the
-	   type of a folder */
-/* 	g_return_if_fail (tny_folder_get_folder_type (per_account_outbox) == TNY_FOLDER_TYPE_OUTBOX); */
-
 	priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self);
 
 	/* Create on-demand */
 	if (!priv->outbox_folder) {
-		priv->outbox_folder = TNY_MERGE_FOLDER (tny_merge_folder_new (_("mcen_me_folder_outbox")));
+		priv->outbox_folder = TNY_MERGE_FOLDER (tny_merge_folder_new_with_ui_locker (_("mcen_me_folder_outbox"), tny_gtk_lockable_new ()));
 	
 		/* Set type to outbox */
 		tny_merge_folder_set_folder_type (priv->outbox_folder, TNY_FOLDER_TYPE_OUTBOX);