sync with 0.9.1cvs1
authorPaul Mangan <paul@claws-mail.org>
Mon, 2 Jun 2003 08:08:28 +0000 (08:08 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 2 Jun 2003 08:08:28 +0000 (08:08 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/addr_compl.c
src/pop.c

index 1a53d59..b3770a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-02
+
+       * src/addr_compl.c: invalidate_address_completion(): check if
+         g_completion_list is NULL (thanks to Kazuhiro NISHIYAMA).
+
+2003-06-02
+
+       * src/pop.c: pop3_session_recv_data_finished(): fixed a bug that
+         deleted messages that is to be kept on server (thanks to Tristan
+         Wallis).
+
 2003-05-27
 
        * version 0.9.1
index e99de9b..aeaeb7d 100644 (file)
@@ -1,3 +1,11 @@
+2003-06-02 [paul]      0.9.0claws11
+
+       * sync with 0.9.1cvs1
+               see ChangeLog 2003-06-02
+               
+       * po/de.po
+               update by Jens
+
 2003-06-01 [christoph] 0.9.0claws10
 
        * src/account.c
index fca5f92..80c7e50 100644 (file)
@@ -1,3 +1,13 @@
+2003-06-02
+
+       * src/addr_compl.c: invalidate_address_completion(): g_completion_list
+         ¤¬ NULL ¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯(À¾»³ Ï¹­¤µ¤ó thanks)¡£
+
+2003-06-02
+
+       * src/pop.c: pop3_session_recv_data_finished(): ¥µ¡¼¥Ð¤ËÊݸ¤µ¤ì¤ë
+         ¤Ù¤­¥á¥Ã¥»¡¼¥¸¤òºï½ü¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ(Tristan Wallis ¤µ¤ó thanks)¡£
+
 2003-05-27
 
        * version 0.9.1
index 7854467..58330ad 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws10
+EXTRA_VERSION=claws11
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index f035c85..3403ce3 100644 (file)
@@ -287,6 +287,7 @@ void replace_address_in_edit(GtkEntry *entry, const gchar *newtext,
                             gint start_pos)
 {
        if (!newtext) return;
+
        gtk_editable_delete_text(GTK_EDITABLE(entry), start_pos, -1);
        gtk_editable_insert_text(GTK_EDITABLE(entry), newtext, strlen(newtext),
                                 &start_pos);
@@ -448,7 +449,8 @@ gint invalidate_address_completion(void)
                free_all();
                init_all();
                read_address_book();
-               g_completion_add_items(g_completion, g_completion_list);
+               if (g_completion_list)
+                       g_completion_add_items(g_completion, g_completion_list);
                clear_completion_cache();
        }
 
index ab97803..8aa4d8a 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -814,7 +814,9 @@ static gint pop3_session_recv_data_finished(Session *session, guchar *data,
                return -1;
 
        if (pop3_session->ac_prefs->rmmail &&
-           pop3_session->ac_prefs->msg_leave_time == 0)
+           pop3_session->ac_prefs->msg_leave_time == 0 &&
+           pop3_session->msg[pop3_session->cur_msg].recv_time
+           != RECV_TIME_KEEP)
                pop3_delete_send(pop3_session);
        else if (pop3_session->cur_msg == pop3_session->count)
                pop3_logout_send(pop3_session);