* src/imap.c

	o quiet compiler and typecast Folder * to IMAP Folder *
	o wake up and fix my previous incompatible type assignment bug

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 04744b3da72ec709e70132aab46782f524c7a25c..6e49382ac10ee44bf573e6b8c355841dba5931d3 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-04-12 [alfons]    0.9.10claws7
+
+       * src/imap.c
+               o quiet compiler and typecast Folder * to IMAP Folder *
+               o wake up and fix my previous incompatible type assignment bug
+

 2004-04-12 [alfons]    0.9.10claws6
 
        * src/imap.c
 2004-04-12 [alfons]    0.9.10claws6
 
        * src/imap.c

diff --git a/configure.ac b/configure.ac
index 9763f6a6e1aec9f08f7c3147c087e21677866fb8..45faa95cd2348da0ef8e0a1cebc22dcc4356db6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/imap.c b/src/imap.c
index 0e69982132a5d6798c6ca2316fc1198996587724..ec7632586ce1f483136447c012999d3076c625d3 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1717,7 +1717,7 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
        g_return_val_if_fail(item->path != NULL, -1);
        g_return_val_if_fail(name != NULL, -1);
 
        g_return_val_if_fail(item->path != NULL, -1);
        g_return_val_if_fail(name != NULL, -1);
 

-       if (strchr(name, imap_get_path_separator(folder, item->path)) != NULL) {
+       if (strchr(name, imap_get_path_separator(IMAP_FOLDER(folder), item->path)) != NULL) {

                g_warning(_("New folder name must not contain the namespace "
                            "path seperator"));
                return -1;
                g_warning(_("New folder name must not contain the namespace "
                            "path seperator"));
                return -1;


@@ -2761,7 +2761,7 @@ static gint imap_cmd_do_select(IMAPSession *session, const gchar *folder,
                        g_warning("imap_cmd_select(): invalid UIDVALIDITY line.\n");
                        THROW;
                }
                        g_warning("imap_cmd_select(): invalid UIDVALIDITY line.\n");
                        THROW;
                }

-               uid_validity = uid_validity_;
+               *uid_validity = uid_validity_;

        }
 
        resp_str = search_array_contain_str(argbuf, "UNSEEN");
        }
 
        resp_str = search_array_contain_str(argbuf, "UNSEEN");