sync with 0.9.4cvs3

diff --git a/ChangeLog b/ChangeLog
index f5c816fed6f5f4e93417f0a8c80fef27c2e658a8..cc26d603199cc1f13e5dc3a90d69eb907dcbb915 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2003-07-30
+
+       * src/folder.[ch]
+         src/imap.[ch]
+         src/mh.[ch]
+         src/procmsg.c
+         src/summaryview.c: renamed *_msgs_with_dest() to *_msgs().
+
+2003-07-29
+
+       * src/imap.[ch]: use CAPABILITY to use protocol extentions.
+         imap_greeting(): parse initial server greeting. Also support
+         PREAUTH response.
+         imap_add_msgs()
+         imap_cmd_append(): use APPENDUID responses if UIDPLUS is supported.
+

 2003-07-28
 
        * src/imap.c: imap_get_flag_str(): fixed a buffer overrun.
 2003-07-28
 
        * src/imap.c: imap_get_flag_str(): fixed a buffer overrun.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eca018d2308781cb5684363fa3403d34b86bf2b1..daa7b3f54f3e33cdcd2d76ee7ed0184918c7e347 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-08-05 [paul]      0.9.4claws4
+
+       * sync with 0.9.4cvs3
+               see ChangeLog 2003-07-30
+

 2003-08-04 [match]     0.9.4claws3
 
        * po/POTFILES.in
 2003-08-04 [match]     0.9.4claws3
 
        * po/POTFILES.in

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 10f6028981ac6b530a19576a41d746e5e3085aed..35191ef84358d967690f928bb68ab7a768f074a1 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,19 @@
+2003-07-30
+
+       * src/folder.[ch]
+         src/imap.[ch]
+         src/mh.[ch]
+         src/procmsg.c
+         src/summaryview.c: *_msgs_with_dest() ¤ò *_msgs() ¤Ë²þ̾¡£
+
+2003-07-29
+
+       * src/imap.[ch]: ¥×¥í¥È¥³¥ë³ÈÄ¥¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë CAPABILITY ¤ò»ÈÍÑ¡£
+         imap_greeting(): ºÇ½é¤Î¥µ¡¼¥Ð¥°¥ê¡¼¥Æ¥£¥ó¥°¤ò²òÀÏ¡£ PREAUTH ±þÅú
+         ¤Ë¤âÂбþ¡£
+         imap_add_msgs()
+         imap_cmd_append(): UIDPLUS ¤ËÂбþ¤·¤Æ¤¤¤ì¤Ð APPENDUID ±þÅú¤ò»ÈÍÑ¡£
+

 2003-07-28
 
        * src/imap.c: imap_get_flag_str(): ¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥é¥ó¤ò½¤Àµ¡£
 2003-07-28
 
        * src/imap.c: imap_get_flag_str(): ¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¡¼¥é¥ó¤ò½¤Àµ¡£

diff --git a/configure.ac b/configure.ac
index 11c6cd5ee40e2ad446836930fd1f1cfc7ecf8e74..01a8bdf0346ad054988dee58abff364debed084b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=3
+EXTRA_VERSION=4

 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/folder.c b/src/folder.c
index 2e7169322ca971f37b3778fc5588edf3c1753b92..e1b6271ee6d295146511af2e9ccbbf12095e3a37 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1806,7 +1806,7 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
        /* move messages */
        log_message(_("Moving %s to %s...\n"), 
                        src->name, new_item->path);
        /* move messages */
        log_message(_("Moving %s to %s...\n"), 
                        src->name, new_item->path);

-       folder_item_move_msgs_with_dest(new_item, mlist);
+       folder_item_move_msgs(new_item, mlist);

        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);
        
        /*copy prefs*/
        folder_item_prefs_copy_prefs(src, new_item);


@@ -1918,7 +1918,7 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
        gint ret;
 
        list = g_slist_append(list, msginfo);
        gint ret;
 
        list = g_slist_append(list, msginfo);

-       ret = folder_item_move_msgs_with_dest(dest, list);
+       ret = folder_item_move_msgs(dest, list);

        g_slist_free(list);
        
        return ret;
        g_slist_free(list);
        
        return ret;


@@ -1950,7 +1950,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
  * \param dest Destination folder
  * \param msglist List of messages
  */
  * \param dest Destination folder
  * \param msglist List of messages
  */

-gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
+gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)

 {
        Folder *folder;
        GSList *l;
 {
        Folder *folder;
        GSList *l;


@@ -2091,7 +2091,7 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
        msglist.data = msginfo;
        msglist.next = NULL;
        
        msglist.data = msginfo;
        msglist.next = NULL;
        

-       return folder_item_copy_msgs_with_dest(dest, &msglist);
+       return folder_item_copy_msgs(dest, &msglist);

 }
 
 /*
 }
 
 /*


@@ -2114,7 +2114,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 }
 */
 
 }
 */
 

-gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
+gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)

 {
        Folder *folder;
        gint num, lastnum = -1;
 {
        Folder *folder;
        gint num, lastnum = -1;

diff --git a/src/folder.h b/src/folder.h
index 6e3aaf33708666416921b8568399199c6ee2bd5c..9de967dc3b216f3a2e8374a9735dd0ced8964d3a 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -433,11 +433,11 @@ gint   folder_item_move_to                (FolderItem     *src,
                                         FolderItem    **new_item);
 gint   folder_item_move_msg            (FolderItem     *dest,
                                         MsgInfo        *msginfo);
                                         FolderItem    **new_item);
 gint   folder_item_move_msg            (FolderItem     *dest,
                                         MsgInfo        *msginfo);

-gint   folder_item_move_msgs_with_dest (FolderItem     *dest,
+gint   folder_item_move_msgs           (FolderItem     *dest,

                                         GSList         *msglist);
 gint   folder_item_copy_msg            (FolderItem     *dest,
                                         MsgInfo        *msginfo);
                                         GSList         *msglist);
 gint   folder_item_copy_msg            (FolderItem     *dest,
                                         MsgInfo        *msginfo);

-gint   folder_item_copy_msgs_with_dest (FolderItem     *dest,
+gint   folder_item_copy_msgs           (FolderItem     *dest,

                                         GSList         *msglist);
 gint   folder_item_remove_msg          (FolderItem     *item,
                                         gint            num);
                                         GSList         *msglist);
 gint   folder_item_remove_msg          (FolderItem     *item,
                                         gint            num);

diff --git a/src/procmsg.c b/src/procmsg.c
index 958024287ed02d952134e1cbc6bebfeb77a9f638..42eb564be7a5d2c486796cd52e1b7bbb7d54f51d 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -302,7 +302,7 @@ void procmsg_move_messages(GSList *mlist)
                } else if (dest == msginfo->to_folder) {
                        movelist = g_slist_append(movelist, msginfo);
                } else {
                } else if (dest == msginfo->to_folder) {
                        movelist = g_slist_append(movelist, msginfo);
                } else {

-                       folder_item_move_msgs_with_dest(dest, movelist);
+                       folder_item_move_msgs(dest, movelist);

                        g_slist_free(movelist);
                        movelist = NULL;
                        dest = msginfo->to_folder;
                        g_slist_free(movelist);
                        movelist = NULL;
                        dest = msginfo->to_folder;


@@ -312,7 +312,7 @@ void procmsg_move_messages(GSList *mlist)
        }
 
        if (movelist) {
        }
 
        if (movelist) {

-               folder_item_move_msgs_with_dest(dest, movelist);
+               folder_item_move_msgs(dest, movelist);

                g_slist_free(movelist);
        }
 
                g_slist_free(movelist);
        }
 


@@ -337,7 +337,7 @@ void procmsg_copy_messages(GSList *mlist)
                } else if (dest == msginfo->to_folder) {
                        copylist = g_slist_append(copylist, msginfo);
                } else {
                } else if (dest == msginfo->to_folder) {
                        copylist = g_slist_append(copylist, msginfo);
                } else {

-                       folder_item_copy_msgs_with_dest(dest, copylist);
+                       folder_item_copy_msgs(dest, copylist);

                        g_slist_free(copylist);
                        copylist = NULL;
                        dest = msginfo->to_folder;
                        g_slist_free(copylist);
                        copylist = NULL;
                        dest = msginfo->to_folder;


@@ -347,7 +347,7 @@ void procmsg_copy_messages(GSList *mlist)
        }
 
        if (copylist) {
        }
 
        if (copylist) {

-               folder_item_copy_msgs_with_dest(dest, copylist);
+               folder_item_copy_msgs(dest, copylist);

                g_slist_free(copylist);
        }
 
                g_slist_free(copylist);
        }
 

diff --git a/src/summaryview.c b/src/summaryview.c
index bccaa7f9fc79d4408bbaf0fac1ac70083cf32fd4..2311ca62fea0f2457231b444c9d7f96435d66685 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3683,7 +3683,7 @@ static void summary_execute_delete(SummaryView *summaryview)
                folder_item_remove_msgs(summaryview->folder_item,
                                        summaryview->mlist);
        else
                folder_item_remove_msgs(summaryview->folder_item,
                                        summaryview->mlist);
        else

-               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+               folder_item_move_msgs(trash, summaryview->mlist);

 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);