sync with 0.9.4cvs13

diff --git a/ChangeLog b/ChangeLog
index fd2b5822e0cdd47f3b4c0d4a59023120cb02287d..851c62d52136226f3b680655b78721e3241de220 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-01
+
+       * src/inc.[ch]
+         src/main.c
+         src/mainwindow.c
+         src/prefs_common.[ch]: added the receive dialog's option to
+         display the dialog only on manual receiving, and the
+         RECV_DIALOG_ACTIVE option was removed.
+
 2003-09-01
 
        * src/compose.c: compose_write_headers(): also replace ':' in the

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2d4ceb13ae85ec4e8d3f673f89c92a46d007b475..407ddba43ed692480b44e4a5b9df0131b65c3247 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-09-01 [paul]      0.9.4claws50
+
+       * sync with 0.9.4cvs13
+               see ChangeLog 2003-09-01
+
 2003-09-01 [paul]      0.9.4claws49
 
        * src/textview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 888a55ffbb46f0adef3e31aeeafc3e58b21afe0b..186f1820982f5dfd0c2eb2814bb62c6f547e2fe4 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2003-09-01
+
+       * src/inc.[ch]
+         src/main.c
+         src/mainwindow.c
+         src/prefs_common.[ch]: ¼êÆ°¼õ¿®»þ¤Î¤ß¼õ¿®¥À¥¤¥¢¥í¥°¤òɽ¼¨¤¹¤ë
+         ¥ª¥×¥·¥ç¥ó¤òÄɲä·¡¢ RECV_DIALOG_ACTIVE ¥ª¥×¥·¥ç¥ó¤òºï½ü¡£
+
 2003-09-01
 
        * src/compose.c: compose_write_headers(): MIME ¶­³¦¤Î ':' ¤â '_' ¤Ë

diff --git a/NEWS b/NEWS
index 7655d446b6bc9a4587acb591219b150ce6537d9f..9b731ab9548f007f3bcb29961cf858228e1fa392 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,44 @@
 Changes of Sylpheed
 
+* 0.9.5
+
+    * The size, the position, and the visibility of separated views are now
+      remembered.
+    * The per-folder settings are now preserved even if a folder tree is
+      rebuilt.
+    * The receive dialog's option to display the dialog only on manual
+      receiving has been added.
+    * 'Top' and 'Bottom' button has been added on the filter setting dialog.
+    * The UIDPLUS extension of IMAP4rev1 has been supported.
+    * The folder system has been cleaned up a bit.
+    * The sylpheed.spec file bundled in the source package has been improved.
+    * The format of MIME boundary has been modified.
+    * A memory leak and a buffer overrun have been fixed.
+
+* 0.9.4
+
+    * The performance of the operation of IMAP4 folders, such as move,
+      copy, delete and mark, has been greatly improved.
+    * The contents of IMAP4 folders are now always synchronized with the
+      server.
+    * Message flags are now properly taken over when copying messages into
+      IMAP4 folders from others.
+    * The CRAM-MD5 authentication mechanism has been supported for IMAP4rev1.
+    * Message move, copy and delete are now possible while receiving mails.
+    * The non-blocking SSL can be turned off as a workaround for the
+      connection problem.
+    * The bug that ran into infinite loop if connection was closed by remote
+      host has been fixed.
+    * The configuration files will not be overwritten on startup anymore.
+
+* 0.9.3
+
+    * The network I/O system has been rewritten to use non-blocking I/O,
+      and the performance of POP3 and SMTP has been improved much.
+    * '--status-full' option has been added. '--status' option now takes
+      arguments for folders.
+    * Minor bugfixes have been made.
+
 * 0.9.2
 
     * The bug that removed messages from server if "Don't receive" action is

diff --git a/configure.ac b/configure.ac
index 7a56bfe544388d0d9a2de27a7aaf5b044c928226..b6d6b06205cd75c7b7c8000c01b1a345b4f77e13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/inc.c b/src/inc.c
index 6595a1a2b59b0a53b6351229df60d5350b51341f..bfdda00b4bc4e35dca3a57d8a96bdd610515d354 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -84,7 +84,8 @@ static void inc_finished              (MainWindow             *mainwin,
 static gint inc_account_mail           (PrefsAccount           *account,
                                         MainWindow             *mainwin);
 
-static IncProgressDialog *inc_progress_dialog_create   (void);
+static IncProgressDialog *inc_progress_dialog_create
+                                       (gboolean                autocheck);
 static void inc_progress_dialog_set_list(IncProgressDialog     *inc_dialog);
 static void inc_progress_dialog_destroy        (IncProgressDialog      *inc_dialog);
 
@@ -233,7 +234,7 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
                session = inc_session_new(account);
                if (!session) return 0;
                
-               inc_dialog = inc_progress_dialog_create();
+               inc_dialog = inc_progress_dialog_create(FALSE);
                inc_dialog->queue_list = g_list_append(inc_dialog->queue_list,
                                                       session);
                inc_dialog->mainwin = mainwin;
@@ -255,7 +256,8 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
        return 0;
 }
 
-void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
+void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
+                         gboolean notify)
 {
        GList *list, *queue_list = NULL;
        IncProgressDialog *inc_dialog;
@@ -322,7 +324,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
                return;
        }
 
-       inc_dialog = inc_progress_dialog_create();
+       inc_dialog = inc_progress_dialog_create(autocheck);
        inc_dialog->queue_list = queue_list;
        inc_dialog->mainwin = mainwin;
        inc_progress_dialog_set_list(inc_dialog);
@@ -337,7 +339,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
        inc_autocheck_timer_set();
 }
 
-static IncProgressDialog *inc_progress_dialog_create(void)
+static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
 {
        IncProgressDialog *dialog;
        ProgressDialog *progress;
@@ -363,8 +365,8 @@ static IncProgressDialog *inc_progress_dialog_create(void)
                         &errorxpm, &errorxpmmask);
 
        if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
-           (prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE &&
-            manage_window_get_focus_window())) {
+           (prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&
+            !autocheck)) {
                dialog->show_dialog = TRUE;
                gtk_widget_show_now(progress->window);
        }
@@ -580,7 +582,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                if (pop3_session->error_val == PS_AUTHFAIL) {
                        if(!prefs_common.no_recv_err_panel) {
                                if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
-                                   ((prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE) && focus_window)) {
+                                   ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
                                        manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
                                }
                                alertpanel_error
@@ -737,7 +739,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                            server, port);
                if(!prefs_common.no_recv_err_panel) {
                        if((prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS) ||
-                           ((prefs_common.recv_dialog_mode == RECV_DIALOG_ACTIVE) && focus_window)) {
+                           ((prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL) && focus_window)) {
                                manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
                        }
                        alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
@@ -1263,7 +1265,7 @@ static gint inc_autocheck_func(gpointer data)
                return FALSE;
        }
 
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_auto);
+       inc_all_account_mail(mainwin, TRUE, prefs_common.newmail_notify_auto);
 
        return FALSE;
 }

diff --git a/src/inc.h b/src/inc.h
index bed915c831bea1dab99fa9167e43a38e7d7a11f9..045bb11c95fe06f69f334516bb1444cfc13b728d 100644 (file)
--- a/src/inc.h
+++ b/src/inc.h
@@ -75,7 +75,8 @@ struct _IncSession
 void inc_mail                  (MainWindow     *mainwin,
                                 gboolean notify);
 void inc_all_account_mail      (MainWindow     *mainwin,
-                                gboolean notify);
+                                gboolean        autocheck,
+                                gboolean        notify);
 void inc_progress_update       (Pop3Session    *session);
 gint inc_drop_message          (const gchar    *file,
                                 Pop3Session    *session);

diff --git a/src/main.c b/src/main.c
index 6969836b0cddf04a480339a4401cfc2e61d11e4d..de91e656ad1c4fa0bd9913fee3ba9f6b269993f8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -333,8 +333,12 @@ int main(int argc, char *argv[])
        /* ignore SIGPIPE signal for preventing sudden death of program */
        signal(SIGPIPE, SIG_IGN);
 
-       if (cmd.receive_all || prefs_common.chk_on_startup)
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       if (cmd.receive_all)
+               inc_all_account_mail(mainwin, FALSE, 
+                                    prefs_common.newmail_notify_manu);
+       else if (prefs_common.chk_on_startup)
+               inc_all_account_mail(mainwin, TRUE, 
+                                    prefs_common.newmail_notify_manu);
        else if (cmd.receive)
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        else
@@ -839,7 +843,8 @@ static void lock_socket_input_cb(gpointer data,
        if (!strncmp(buf, "popup", 5)) {
                main_window_popup(mainwin);
        } else if (!strncmp(buf, "receive_all", 11)) {
-               inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+               inc_all_account_mail(mainwin, FALSE,
+                                    prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "receive", 7)) {
                inc_mail(mainwin, prefs_common.newmail_notify_manu);
        } else if (!strncmp(buf, "compose_attach", 14)) {

diff --git a/src/prefs_common.c b/src/prefs_common.c
index d0131d5e3e2d3bbcf0e1784a28f9dad60500eb96..8a88a796d753243866d90037c99e0dfeec730325 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1201,8 +1201,8 @@ static void prefs_receive_create(void)
 
        menu = gtk_menu_new ();
        MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
-       MENUITEM_ADD (menu, menuitem, _("Only if a window is active"),
-                     RECV_DIALOG_ACTIVE);
+       MENUITEM_ADD (menu, menuitem, _("Only on manual receiving"),
+                     RECV_DIALOG_MANUAL);
        MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);

diff --git a/src/prefs_common.h b/src/prefs_common.h
index df54f7c56b635bc28c4231f87f2a8fd266e8d8be..4fcf29585f522089effade9b94b2fd0f0454c2dd 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -35,7 +35,7 @@ typedef struct _PrefsCommon   PrefsCommon;
 
 typedef enum {
        RECV_DIALOG_ALWAYS,
-       RECV_DIALOG_ACTIVE,
+       RECV_DIALOG_MANUAL,
        RECV_DIALOG_NEVER
 } RecvDialogMode;
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 4ff1c754e93c41217549560a35915b9fc032f92e..79598b292adb08e2de1b9dbc2ed8712eb4b9b73b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -2035,7 +2035,7 @@ void inc_all_account_mail_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MainWindow *mainwin = (MainWindow*)data;
 
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       inc_all_account_mail(mainwin, FALSE, prefs_common.newmail_notify_manu);
 }
 
 void send_queue_cb(gpointer data, guint action, GtkWidget *widget)