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

1 files changed, 0 insertions, 19 deletions

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);