2006-05-03 [colin] 2.1.1cvs46

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index 33484cefa2a2c2b97a2bf3b825dcab04b5cfe73f..d9bfe510d972a3ddd336f98cf44c5ce4e0032ae5 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -2248,11 +2248,31 @@ static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
        return NULL;
 }
 
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+       Folder *folder = NULL;
+       IMAPFolder *imap_folder = NULL;
+       if (!item)
+               return '/';
+       folder = item->folder;
+       
+       if (!folder)
+               return '/';
+       
+       imap_folder = IMAP_FOLDER(folder);
+       
+       if (!imap_folder)
+               return '/';
+       
+       return imap_get_path_separator(imap_folder, item->path);
+}
 
 static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
 {
        IMAPNameSpace *namespace;
        gchar separator = '/';
+       Session *session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, -1);
 
        if (folder->last_seen_separator == 0) {
                clist * lep_list;
@@ -4259,6 +4279,11 @@ static gint      imap_rename_folder      (Folder         *folder,
        return -1;
 }
 
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+       return '/';
+}
+
 FolderClass *imap_get_class(void)
 {
        if (imap_class.idstr == NULL) {
@@ -4289,10 +4314,12 @@ void imap_synchronise(FolderItem *item)
 
 static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {
+#ifdef HAVE_LIBETPAN
        GList *cur;
-
+#endif
        folder_item_set_xml(folder, item, tag);
        
+#ifdef HAVE_LIBETPAN
        for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
                XMLAttr *attr = (XMLAttr *) cur->data;
 
@@ -4300,6 +4327,7 @@ static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                if (!strcmp(attr->name, "uidnext"))
                        IMAP_FOLDER_ITEM(item)->uid_next = atoi(attr->value);
        }
+#endif
 }
 
 static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item)
@@ -4308,8 +4336,10 @@ static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item)
 
        tag = folder_item_get_xml(folder, item);
 
+#ifdef HAVE_LIBETPAN
        xml_tag_add_attr(tag, xml_attr_new_int("uidnext", 
                        IMAP_FOLDER_ITEM(item)->uid_next));
 
+#endif
        return tag;
 }