sync with 0.9.10cvs16

diff --git a/ChangeLog b/ChangeLog
index dbbd24d222ac010673dfdf27c66d0ce1214c5673..e26d122215dca4462d07a6f9cc2a67e7a7fafb84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-05-20
+
+       * src/folderview.[ch]: implemented spring-loaded folder.
+
+2004-05-20
+
+       * src/folderview.c: folderview_button_pressed(): enable menu item
+         'Search messages...' only when opened folder is selected.
+
+2004-05-19
+
+       * src/compose.c
+         src/prefs_common.[ch]: removed the option "Queue messages that fail
+         to send".
+
 2004-05-18
 
        * src/summaryview.c: cleaned up the context menu.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8fb4cefb7edcdac3ae66f9c5450fe135ac645adf..651035985a4775d210aea60e3905c85e68938125 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-05-20 [paul]      0.9.10claws66
+
+       * sync with 0.9.10cvs16
+               see ChangeLog 2004-05-19 and 2004-05-20
+
 2004-05-19 [alfons]    0.9.10claws65
 
        * src/summaryview.h

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c728e927079ca6ae7327e85b0fa69a8b063ee6fe..05a3c669369e19ad332c04bd515c81677b8d38a2 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,19 @@
+2004-05-20
+
+       * src/folderview.[ch]: ¥¹¥×¥ê¥ó¥°¥í¡¼¥Ç¥Ã¥É¥Õ¥©¥ë¥À¤ò¼ÂÁõ¡£
+
+2004-05-20
+
+       * src/folderview.c: folderview_button_pressed(): ³«¤¤¤Æ¤¤¤ë¥Õ¥©¥ë¥À
+         ¤¬ÁªÂò¤µ¤ì¤¿¤È¤­¤Î¤ß¡Ö¥á¥Ã¥»¡¼¥¸¤ò¸¡º÷...¡×¥á¥Ë¥å¡¼¹àÌܤòÍ­¸ú¤Ë
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-05-19
+
+       * src/compose.c
+         src/prefs_common.[ch]: ¡ÖÁ÷¿®¤Ë¼ºÇÔ¤·¤¿¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®ÂÔ¤Á¤Ë
+         Æþ¤ì¤ë¡×¥ª¥×¥·¥ç¥ó¤òºï½ü¡£
+
 2004-05-18
 
        * src/summaryview.c: ¥³¥ó¥Æ¥­¥¹¥È¥á¥Ë¥å¡¼¤òÀ°Íý¡£

diff --git a/TODO b/TODO
index 5b64934facb49cd22b98192d4715ef76b8f373ca..fcaf98d0366f12f9e9cdd2cc54ac9c4007af3474 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,6 +7,7 @@ o enhancement of filtering
 o improvements of addressbook
 o POP before SMTP
 o original icons and logos
+o more efficient SMTP handling for multiple messages
 o more robust IMAP4 response parser
 o support for some formats other than MH and mbox (ex. Maildir)
 o priority (Priority:, X-Priority:, X-MSMail-Priority:)

diff --git a/TODO.jp b/TODO.jp
index 49af76c8486b7841d94df4363c340ce3a4b6a16f..7e8dd35522a3e7adf0c83229c7299667d1fb9dd7 100644 (file)
--- a/TODO.jp
+++ b/TODO.jp
@@ -7,6 +7,7 @@ o 
 o ¥¢¥É¥ì¥¹Ä¢¤Î²þÎÉ
 o POP before SMTP
 o ¥ª¥ê¥¸¥Ê¥ë¤Î¥¢¥¤¥³¥ó¤È¥í¥´
+o ¤è¤ê¸úΨŪ¤ÊÊ£¿ô¥á¥Ã¥»¡¼¥¸¤Î SMTP ½èÍý
 o ¤è¤ê·øÏ´¤Ê IMAP4 ±þÅú¥Ñ¡¼¥µ
 o MH, mbox °Ê³°¤Î·Á¼°¤Ø¤ÎÂбþ (Maildir Åù)
 o ½ÅÍ×ÅÙ (Priority:, X-Priority:, X-MSMail-Priority:)

diff --git a/configure.ac b/configure.ac
index adb2129fb1898bcd244852a56a3b41af14e505e7..e452b8f33a695b541b8357c4675c80b23e277eac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=65
+EXTRA_VERSION=66
 
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws

diff --git a/src/compose.c b/src/compose.c
index 64dc47487eecbebc2898f4e5514a10809c80c8ca..495217f9c9cbd1e37b018a35ab0320f4495b9c23 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3204,24 +3204,7 @@ gint compose_send(Compose *compose)
                }
        }
 
-       /* queue message if failed to send */
-       if (ok < 0) {
-               if (prefs_common.queue_msg) {
-                       AlertValue val;
-
-                       val = alertpanel
-                               (_("Queueing"),
-                                _("Error occurred while sending the message.\n"
-                                  "Put this message into queue folder?"),
-                                _("OK"), _("Cancel"), NULL);
-                       if (G_ALERTDEFAULT == val) {
-                               ok = compose_queue(compose, tmp);
-                               if (ok < 0)
-                                       alertpanel_error(_("Can't queue the message."));
-                       }
-               } else
-                       alertpanel_error_log(_("Error occurred while sending the message."));
-       } else {
+       if (ok == 0) {
                if (compose->mode == COMPOSE_REEDIT) {
                        compose_remove_reedit_target(compose);
                }

diff --git a/src/folderview.c b/src/folderview.c
index cd50d58351641fa6e339c4be0a76f51466d17320..6c8b240c4c3c84f1fddde5b90ea4708892225802 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1380,7 +1380,8 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        menu_set_sensitive(fpopup_factory, name, sens)
 
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
-       SET_SENS("/Search folder...", item->total_msgs >= 1);
+       SET_SENS("/Search folder...", item->total_msgs >= 1 && 
+                folderview->selected == folderview->opened);
        SET_SENS("/Properties...", TRUE);
        SET_SENS("/Processing...", item->node->parent != NULL);
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index bcc3ec383444d2d3cc43ff6a63724b45214282d1..07312a8a2d8b292a94c62a2dcd0b938e7d848f4b 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -85,7 +85,6 @@ static struct Receive {
 
 static struct Send {
        GtkWidget *checkbtn_savemsg;
-       GtkWidget *checkbtn_queuemsg;
        GtkWidget *optmenu_senddialog;
 
        GtkWidget *optmenu_charset;
@@ -285,9 +284,6 @@ static PrefParam param[] = {
        {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
         &p_send.checkbtn_savemsg,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"queue_message", "FALSE", &prefs_common.queue_msg, P_BOOL,
-        &p_send.checkbtn_queuemsg,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
         &p_send.optmenu_senddialog,
         prefs_common_send_dialog_set_data_from_optmenu,
@@ -1216,7 +1212,6 @@ static void prefs_send_create(void)
        GtkWidget *vbox2;
        GtkWidget *hbox1;
        GtkWidget *checkbtn_savemsg;
-       GtkWidget *checkbtn_queuemsg;
        GtkWidget *label_outcharset;
        GtkWidget *optmenu_charset;
        GtkWidget *optmenu_menu;
@@ -1241,8 +1236,6 @@ static void prefs_send_create(void)
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg,
                           _("Save sent messages to Sent folder"));
-       PACK_CHECK_BUTTON (vbox2, checkbtn_queuemsg,
-                          _("Queue messages that fail to send"));
 
        hbox_senddialog = gtk_hbox_new (FALSE, 8);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox_senddialog, FALSE, FALSE, 0);
@@ -1361,7 +1354,6 @@ static void prefs_send_create(void)
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        p_send.checkbtn_savemsg  = checkbtn_savemsg;
-       p_send.checkbtn_queuemsg = checkbtn_queuemsg;
        p_send.optmenu_senddialog = optmenu_senddialog;
 
        p_send.optmenu_charset = optmenu_charset;

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 971e7d832cf0b97ccd8dc725c6972349b17b96ab..141367cc8f51960ff487a198ddded2f3050c8186 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -77,7 +77,6 @@ struct _PrefsCommon
 
        /* Send */
        gboolean savemsg;
-       gboolean queue_msg;
        SendDialogMode send_dialog_mode;
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;