If we are asking for the toplevel folders, use the IMAP store's namespace

2002-08-05  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/imap/camel-imap-store.c (get_folder_info_online): If
	we are asking for the toplevel folders, use the IMAP store's
	namespace as the toplevel folder rather than an empty
	string. Fixes bug #28574.
	(imap_forget_folder): Rearrange the code so that name can never be
	used uninitialised.

	* providers/imap/camel-imap-utils.c (imap_namespace_concat):
	Removed.

svn path=/trunk/; revision=17699

1 files changed, 0 insertions, 22 deletions

diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 48cadf02d2..0d5d45c30e 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -1095,28 +1095,6 @@ imap_concat (CamelImapStore *imap_store, const char *prefix, const char *suffix)
 		return g_strdup_printf ("%s%c%s", prefix, imap_store->dir_sep, suffix);
 }
 
-char *
-imap_namespace_concat (CamelImapStore *store, const char *name)
-{
-	if (!name || *name == '\0') {
-		if (store->namespace)
-			return g_strdup (store->namespace);
-		else
-			return g_strdup ("");
-	}
-	
-	if (!g_strcasecmp (name, "INBOX"))
-		return g_strdup ("INBOX");
-	
-	if (store->namespace == NULL) {
-		g_warning ("Trying to concat NULL namespace to \"%s\"!", name);
-		return g_strdup (name);
-	}
-	
-	return imap_concat (store, store->namespace, name);
-}
-
-
 #define UTF8_TO_UTF7_LEN(len)  ((len * 3) + 8)
 #define UTF7_TO_UTF8_LEN(len)  (len)