Merge branch 'master' into kill-bonobo

Conflicts:
	addressbook/gui/Makefile.am
	addressbook/gui/widgets/Makefile.am
	addressbook/gui/widgets/eab-popup-control.c
	calendar/gui/e-meeting-time-sel.c
	calendar/gui/migration.c
	calendar/modules/e-memo-shell-module-migrate.h
	e-util/e-logger.c
	mail/e-mail-attachment-bar.c
	mail/em-composer-utils.c
	mail/em-format-html-display.c
	plugins/mail-account-disable/Makefile.am
	plugins/select-one-source/Makefile.am
	po/es.po
	shell/Makefile.am
	shell/e-shell-common.h
	shell/e-shell-nm.c
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-sidebar.c
	shell/e-user-creatable-items-handler.c
	shell/importer/Makefile.am
	shell/test/Makefile.am
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/misc/test-multi-config-dialog.c

7 files changed, 15 insertions, 33 deletions

diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index eaf817a0b7..d87db9c181 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2358,5 +2358,5 @@ emft_queue_save_state (EMFolderTree *emft)
 	if (priv->save_state_id != 0)
 		return;
 
-	priv->save_state_id = g_timeout_add (1000, (GSourceFunc) emft_save_state, emft);
+	priv->save_state_id = g_timeout_add_seconds (1, (GSourceFunc) emft_save_state, emft);
 }
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 3dca693698..2f6ecfef3c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -234,8 +234,8 @@
       <locale name="C">
          <short>Enable or disable type ahead search feature</short>
          <long>
-           Enable side bar search feature so that you can start interactive searching by typing in the text. Use is that you can easily find a folder in that side bar by just typing the folder name and the selection jumps automatically to that folder.
-         </long>
+          Enable the side bar search feature to allow interactive searching of folder names.
+       </long>
       </locale>
     </schema>
 
@@ -969,7 +969,7 @@
       <locale name="C">
          <short>Prompt while marking multiple messages</short>
          <long>
-	 It disables/enables the prompt while marking multiple messages.
+	Enable or disable the prompt whilst marking multiple messages.
          </long>
       </locale>
     </schema>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 46a62e4fc2..f4e07f289c 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -982,8 +982,8 @@ mail_note_store(EShellModule *shell_module, CamelStore *store, CamelOperation *o
 		count_sent = getenv("EVOLUTION_COUNT_SENT") != NULL;
 		count_trash = getenv("EVOLUTION_COUNT_TRASH") != NULL;
 		buf = getenv ("EVOLUTION_PING_TIMEOUT");
-		timeout = buf ? strtoul (buf, NULL, 10) * 1000 : 600000;
-		ping_id = g_timeout_add (timeout, ping_cb, NULL);
+		timeout = buf ? strtoul (buf, NULL, 10) : 600;
+		ping_id = g_timeout_add_seconds (timeout, ping_cb, NULL);
 	}
 
 	si = g_hash_table_lookup(stores, store);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 939d3d2dd8..6e77055bac 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2075,7 +2075,7 @@ save_messages_exec (struct _save_messages_msg *m)
 	if (strstr (m->path, "://"))
 		path = m->path;
 	else
-		path = g_strjoin (NULL, "file://", m->path, NULL);
+		path = g_filename_to_uri (m->path, NULL, NULL);
 
 	stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE);
 	from_filter = camel_mime_filter_from_new();
@@ -2189,7 +2189,7 @@ save_part_exec (struct _save_part_msg *m)
 	if (strstr (m->path, "://"))
 		path = m->path;
 	else
-		path = g_strjoin (NULL, "file://", m->path, NULL);
+		path = g_filename_to_uri (m->path, NULL, NULL);
 
 	if(!m->readonly){
 		if (!(stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE))) {
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 9fe40a5fbc..3ffc9b46a6 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1045,7 +1045,7 @@ auto_account_commit(struct _auto_data *info)
 	}
 	info->period = period;
 	if (check && info->timeout_id == 0)
-		info->timeout_id = g_timeout_add(info->period*1000, auto_timeout, info);
+		info->timeout_id = g_timeout_add_seconds(info->period, auto_timeout, info);
 }
 
 static void
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 817b647dd7..2afcafdd6a 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -104,12 +104,6 @@ vfolder_setup_exec (struct _setup_msg *m)
 	l = m->sources_uri;
 	while (l && !shutdown) {
 		d(printf(" Adding uri: %s\n", (char *)l->data));
-		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
-			strncmp((char *)l->data, "email://vfolder@local", 21) == 0) {
-			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
-			l=l->next;
-			continue;
-		}
 
 		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
 		if (folder) {
@@ -268,11 +262,6 @@ vfolder_adduri_exec (struct _adduri_msg *m)
 		g_warning("Folder '%s' disappeared while I was adding/remove it to/from my vfolder", m->uri);
 		return;
 	}
-	if (strncmp(m->uri, "vfolder:/", 9) == 0 ||
-		strncmp(m->uri, "email://vfolder@local", 21) == 0) {
-		printf("Ignoring loading vfolder as a subfolder \n");
-		return;
-	}
 
 	if (folder == NULL)
 		folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex);
@@ -725,14 +714,6 @@ rule_add_sources(GList *l, GList **sources_folderp, GList **sources_urip)
 	while (l) {
 		char *curi = em_uri_to_camel(l->data);
 
-		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
-			strncmp((char *)l->data, "email://vfolder@local", 21) == 0) {
-			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
-			l=l->next;
-			g_free(curi);
-			continue;
-		}
-
 		if (mail_note_get_folder_from_uri(curi, &newfolder)) {
 			if (newfolder)
 				sources_folder = g_list_append(sources_folder, newfolder);
diff --git a/mail/message-list.c b/mail/message-list.c
index 11d0f19707..39784acfcc 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2760,7 +2760,7 @@ clear_info(char *key, ETreePath *node, MessageList *ml)
 }
 
 static void
-clear_tree (MessageList *ml)
+clear_tree (MessageList *ml, gboolean tfree)
 {
 	ETreeModel *etm = ml->model;
 
@@ -2784,7 +2784,8 @@ clear_tree (MessageList *ml)
 	}
 
 	ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
-
+	if (tfree)
+		e_tree_model_rebuilt (E_TREE_MODEL(etm));	
 #ifdef TIMEIT
 	gettimeofday(&end, NULL);
 	diff = end.tv_sec * 1000 + end.tv_usec/1000;
@@ -2945,7 +2946,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c
 		selected = message_list_get_selected(ml);
 #endif
 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
-		clear_tree (ml);
+		clear_tree (ml, FALSE);
 
 		build_subtree(ml, ml->tree_root, thread->tree, &row);
 		e_tree_memory_thaw(E_TREE_MEMORY(etm));
@@ -3264,7 +3265,7 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes)
 		selected = message_list_get_selected(ml);
 #endif
 		e_tree_memory_freeze(E_TREE_MEMORY(etm));
-		clear_tree (ml);
+		clear_tree (ml, FALSE);
 		for (i = 0; i < summary->len; i++) {
 			ETreePath node;
 			CamelMessageInfo *info = summary->pdata[i];
@@ -3530,7 +3531,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c
 	}
 
 	e_tree_memory_freeze(E_TREE_MEMORY(etm));
-	clear_tree (message_list);
+	clear_tree (message_list, TRUE);
 	e_tree_memory_thaw(E_TREE_MEMORY(etm));
 
 	if (message_list->folder) {