Don't use dir_sep as top-level directory, use "/".

2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>

	* providers/imap/camel-imap-store.c (get_folder): Don't use
	dir_sep as top-level directory, use "/".

	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of
	unused variable.

svn path=/trunk/; revision=5437

2 files changed, 5 insertions, 8 deletions

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 8a6998fa76..1e83134823 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -199,8 +199,6 @@ camel_imap_folder_new (CamelStore *parent, char *folder_name, CamelException *ex
 	if (!strcmp (folder_name, url->path + 1))
 		folder->can_hold_messages = FALSE;
 	
-	/*CF_CLASS (folder)->refresh_info (folder, ex);*/
-	
 	if (camel_exception_is_set (ex)) {
 		camel_object_unref (CAMEL_OBJECT (folder));
 		return NULL;
@@ -360,7 +358,6 @@ imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 static void
 imap_expunge (CamelFolder *folder, CamelException *ex)
 {
-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
 	gchar *result;
 	gint status;
 	
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 209b8a6fbb..8ad787d629 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -488,17 +488,16 @@ get_folder (CamelStore *store, const char *folder_name, gboolean create, CamelEx
 {
 	CamelURL *url = CAMEL_SERVICE (store)->url;
 	CamelFolder *new_folder;
-	char *folder_path, *dir_sep;
+	char *folder_path;
 	gboolean exists = FALSE;
 	gboolean selectable;
 	
 	g_return_val_if_fail (store != NULL, NULL);
 	g_return_val_if_fail (folder_name != NULL, NULL);
 	
-	dir_sep = CAMEL_IMAP_STORE (store)->dir_sep;
-	
 	/* if we're trying to get the top-level dir, we really want the namespace */
-	if (!dir_sep || !strcmp (folder_name, dir_sep))
+	/* Yes, we use a hard-coded "/" here - this just means top-level directory */
+	if (!strcmp (folder_name, "/"))
 		folder_path = g_strdup (url->path + 1);
 	else
 		folder_path = g_strdup (folder_name);
@@ -509,7 +508,8 @@ get_folder (CamelStore *store, const char *folder_name, gboolean create, CamelEx
 		return NULL;
 	
 	/* this is the top-level dir, we already know it exists - it has to! */
-	if (!strcmp (folder_name, dir_sep)) {
+	/* Yes, we use a hard-coded "/" here - this just means top-level directory */
+	if (!strcmp (folder_name, "/")) {
 		camel_folder_refresh_info (new_folder, ex);
 		return new_folder;
 	}