[evolution/wip/gsettings] mail-send-recv.c:get_folders(): Adapt to CamelVeeStore change.

[Rodrigo Moya <rodrigo src gnome org>]

commit 23efd7246febed6ed907d0a97063e7061d338b65
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu May 5 14:34:31 2011 -0400

    mail-send-recv.c:get_folders(): Adapt to CamelVeeStore change.
    
    See E-D-S commit 26c74be4066dff41dd1e9c9adc1c2c116142ba60.

 mail/mail-send-recv.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index b54e433..7bc8384 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -35,6 +35,7 @@
 #include "e-util/e-account-utils.h"
 #include "e-util/gconf-bridge.h"
 
+#include "e-mail-folder-utils.h"
 #include "e-mail-local.h"
 #include "e-mail-session.h"
 #include "em-event.h"
@@ -898,15 +899,13 @@ get_folders (CamelStore *store, GPtrArray *folders, CamelFolderInfo *info)
 {
 	while (info) {
 		if (camel_store_can_refresh_folder (store, info, NULL)) {
-			CamelURL *url = camel_url_new (info->uri, NULL);
+			if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) {
+				gchar *folder_uri;
 
-			if (url && (!camel_url_get_param (url, "noselect") ||
-				!g_str_equal (camel_url_get_param (
-				url, "noselect"), "yes")))
-				g_ptr_array_add (folders, g_strdup (info->uri));
-
-			if (url)
-				camel_url_free (url);
+				folder_uri = e_mail_folder_uri_build (
+					store, info->full_name);
+				g_ptr_array_add (folders, folder_uri);
+			}
 		}
 
 		get_folders (store, folders, info->child);