sync with 0.4.66cvs4, and incorporated EricL's no dialog patch.
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 12 May 2001 10:41:00 +0000 (10:41 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 12 May 2001 10:41:00 +0000 (10:41 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/compose.c
src/inc.c
src/prefs_common.c
src/prefs_common.h

index b56fe68..1724714 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-11
+
+       * src/inc.c: connection_check_cb(): fixed a bug that caused
+         segmentation fault if connection was not established.
+       * src/compose.c: compose_create(): even if set_autobcc or set
+         autoreplyto is checked and the entries are empty, show them.
+
 2001-05-10
 
        * src/textview.c: textview_show_mime_part(): modified the messages.
index b80459e..f0439a3 100644 (file)
@@ -1,3 +1,13 @@
+2001-05-12 [alfons]
+
+       0.4.67claws2
+       
+       * src/inc.c, src/prefs_common.c, src/prefs_common.h: 
+               applied "toggle mail-retrieval dialog window" patch submitted 
+               by Eric Limpens <eric@qnt.net>
+
+       * sync with sylpheed 0.4.67cvs4
+
 2001-05-12 [sergey]
 
        * src/matcher.c, src/scoring.c: changed "#ifdef 0" to "#if 0" for
index 69779ab..9fc15ad 100644 (file)
@@ -1,3 +1,10 @@
+2001-05-11
+
+       * src/inc.c: connection_check_cb(): Àܳ¤¬³ÎΩ¤·¤Ê¤«¤Ã¤¿¤È¤­¤Ë
+         segmentation fault ¤òµ¯¤³¤¹¥Ð¥°¤ò½¤Àµ¡£
+       * src/compose.c: compose_create(): set_autobcc ¤Þ¤¿¤Ï set_autoreplyto
+         ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤¿¤é¡¢¤½¤ì¤é¤¬¶õ¤Ç¤âɽ¼¨¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2001-05-10
 
        * src/textview.c: textview_show_mime_part(): ¥á¥Ã¥»¡¼¥¸¤ò½¤Àµ¡£
index eb559f7..bf153ae 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=67
 INTERFACE_AGE=67
 BINARY_AGE=67
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 79bb45b..9b76679 100644 (file)
@@ -2674,25 +2674,22 @@ static Compose *compose_create(PrefsAccount *account)
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
                gtk_widget_set_sensitive(menuitem, FALSE);
        }
-       if (account->set_autocc && account->auto_cc) {
-               gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
-               menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       }
-       if (account->set_autobcc && account->auto_bcc) {
-               gtk_entry_set_text(GTK_ENTRY(bcc_entry), account->auto_bcc);
+       if (account->set_autobcc) {
                menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
                gtk_check_menu_item_set_active
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+               if (account->auto_bcc)
+                       gtk_entry_set_text(GTK_ENTRY(bcc_entry),
+                                          account->auto_bcc);
        }
-       if (account->set_autoreplyto && account->auto_replyto) {
-               gtk_entry_set_text(GTK_ENTRY(reply_entry),
-                                  account->auto_replyto);
+       if (account->set_autoreplyto) {
                menuitem = gtk_item_factory_get_item(ifactory,
                                                     "/Message/Reply to");
                gtk_check_menu_item_set_active
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+               if (account->auto_replyto)
+                       gtk_entry_set_text(GTK_ENTRY(reply_entry),
+                                          account->auto_replyto);
        }
 
        menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
index 3da201a..1e86092 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -263,16 +263,20 @@ static IncProgressDialog *inc_progress_dialog_create(void)
                           GTK_SIGNAL_FUNC(gtk_true), NULL);
        manage_window_set_transient(GTK_WINDOW(progress->window));
 
+
        progress_dialog_set_value(progress, 0.0);
 
-       gtk_widget_show(progress->window);
+       if (prefs_common.show_retrieve_dialog)
+        {
+         gtk_widget_show(progress->window);
 
-       PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
-       PIXMAP_CREATE(progress->clist,
+         PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
+         PIXMAP_CREATE(progress->clist,
                      currentxpm, currentxpmmask, continue_xpm);
-       PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
+         PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
 
-       gtk_widget_show_now(progress->window);
+         gtk_widget_show_now(progress->window);
+       }
 
        dialog->dialog = progress;
        dialog->queue_list = NULL;
@@ -661,19 +665,19 @@ static gint connection_check_cb(Automaton *atm)
        if (sockinfo->state == CONN_LOOKUPFAILED ||
            sockinfo->state == CONN_FAILED) {
                atm->timeout_tag = 0;
-               pop3_automaton_terminate(sockinfo->sock, atm);
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            sockinfo->hostname, sockinfo->port);
                manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
                alertpanel_error(_("Can't connect to POP3 server: %s:%d"),
                                 sockinfo->hostname, sockinfo->port);
                manage_window_focus_out(inc_dialog->dialog->window, NULL, NULL);
+               pop3_automaton_terminate(sockinfo, atm);
                return FALSE;
        } else if (sockinfo->state == CONN_ESTABLISHED) {
                atm->timeout_tag = 0;
-               atm->tag = gdk_input_add(sockinfo->sock,
-                                        atm->state[atm->num].condition,
-                                        automaton_input_cb, atm);
+               atm->tag = sock_gdk_input_add(sockinfo,
+                                             atm->state[atm->num].condition,
+                                             automaton_input_cb, atm);
                return FALSE;
        } else {
                return TRUE;
index d5873e8..ec15af2 100644 (file)
@@ -149,6 +149,7 @@ static struct Interface {
        GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_returnreceipt;
        GtkWidget *checkbtn_addaddrbyclick;
+       GtkWidget *checkbtn_retrievedialog;
 } interface;
 
 static struct Other {
@@ -482,6 +483,9 @@ static PrefParam param[] = {
        {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
         P_BOOL, &interface.checkbtn_openunread,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"show_retrieve_dialog", "FALSE", &prefs_common.show_retrieve_dialog,
+        P_BOOL, &interface.checkbtn_retrievedialog,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"open_inbox_on_inc", "TRUE", &prefs_common.open_inbox_on_inc,
         P_BOOL, &interface.checkbtn_openinbox,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -1793,6 +1797,7 @@ static void prefs_interface_create(void)
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
+       GtkWidget *checkbtn_retrievedialog;
        GtkWidget *checkbtn_returnreceipt;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1814,6 +1819,10 @@ static void prefs_interface_create(void)
                (vbox2, checkbtn_openunread,
                 _("Open first unread message when entering a folder"));
 
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_retrievedialog,
+                _("Display dialog when retrieving mail"));
+
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_openinbox,
                 _("Go to inbox after receiving new mail"));
@@ -1876,6 +1885,7 @@ static void prefs_interface_create(void)
        interface.checkbtn_askonclean     = checkbtn_askonclean;
        interface.checkbtn_warnqueued     = checkbtn_warnqueued;
        interface.checkbtn_returnreceipt  = checkbtn_returnreceipt;
+       interface.checkbtn_retrievedialog = checkbtn_retrievedialog;
 }
 
 static void prefs_other_create(void)
index 3f341a4..1c98157 100644 (file)
@@ -81,6 +81,7 @@ struct _PrefsCommon
 
        gboolean show_mark;
        gboolean show_unread;
+       gboolean show_retrieve_dialog;
        gboolean show_mime;
        gboolean show_number;
        gboolean show_score;