sync with 0.7.8cvs13
authorPaul Mangan <paul@claws-mail.org>
Tue, 2 Jul 2002 09:41:25 +0000 (09:41 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 2 Jul 2002 09:41:25 +0000 (09:41 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/account.c
src/inc.c
src/prefs_common.c
src/prefs_common.h

index 0ca28a4..d0069dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-02
+
+       * src/prefs_common.[ch]
+         src/inc.c: added an option to inhibit receive error dialog.
+
+2002-07-01
+
+       * src/account.c: account_find_from_address(): support multiple
+         addresses in header.
+
 2002-06-28
 
        * src/gtksctree.[ch]: changed GtkSCTree::anchor_row from gint to
index 57cb6bd..8936a39 100644 (file)
@@ -1,3 +1,8 @@
+2002-07-02 [paul]      0.7.8claws42
+
+       * sync with 0.7.8cvs13
+               see ChangeLog 2002-07-01 and 2002-07-02
+
 2002-07-01 [christoph] 0.7.8claws41
 
        * src/summaryview.c
index e91353b..58c4086 100644 (file)
@@ -1,3 +1,13 @@
+2002-07-02
+
+       * src/prefs_common.[ch]
+         src/inc.c: ¼õ¿®¥¨¥é¡¼¥À¥¤¥¢¥í¥°¤òÍÞÀ©¤¹¤ë¥ª¥×¥·¥ç¥ó¤òÄɲá£
+
+2002-07-01
+
+       * src/account.c: account_find_from_address(): ¥Ø¥Ã¥À¤ÎÊ£¿ô¤Î¥¢¥É¥ì¥¹
+         ¤ËÂбþ¡£
+
 2002-06-28
 
        * src/gtksctree.[ch]: ¹Ô¤Î°ÜÆ°¸å¤Ë̵¸ú¤Ë¤Ê¤é¤Ê¤¤¤è¤¦¤Ë
index 39c5f19..90b9ed0 100644 (file)
@@ -9,7 +9,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws41
+EXTRA_VERSION=claws42
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 108247e..54a75f8 100644 (file)
@@ -206,7 +206,7 @@ PrefsAccount *account_find_from_address(const gchar *address)
        for (cur = account_list; cur != NULL; cur = cur->next) {
                ac = (PrefsAccount *)cur->data;
                if (ac->protocol != A_NNTP && ac->address &&
-                   strcasestr(address, ac->address))
+                   strcasestr(address, ac->address) != NULL)
                        return ac;
        }
 
index 1411cf3..8b8d034 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -548,7 +548,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                }
 
                if (pop3_state->error_val == PS_AUTHFAIL) {
-                       if(!prefs_common.noerrorpanel) {
+                       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)) {
                                        manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
@@ -630,7 +630,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                num++;
        }
 
-       if (error_num && !prefs_common.noerrorpanel) {
+       if (error_num && !prefs_common.no_recv_err_panel) {
                if (inc_dialog->show_dialog)
                        manage_window_focus_in(inc_dialog->dialog->window,
                                               NULL, NULL);
@@ -726,7 +726,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        if ((sockinfo = sock_connect(server, port)) == NULL) {
                log_warning(_("Can't connect to POP3 server: %s:%d\n"),
                            server, port);
-               if(!prefs_common.noerrorpanel) {
+               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)) {
                                manage_window_focus_in(inc_dialog->dialog->window, NULL, NULL);
@@ -1049,9 +1049,9 @@ static void inc_put_error(IncState istate)
 {
        switch (istate) {
        case INC_ERROR:
-               if(!prefs_common.noerrorpanel) {
-                       alertpanel_error(_("Error occurred while processing mail."));
-               }
+               if (!prefs_common.no_recv_err_panel)
+                       alertpanel_error
+                               (_("Error occurred while processing mail."));
                break;
        case INC_NOSPACE:
                alertpanel_error(_("No disk space left."));
index c4bbb8b..56a322f 100644 (file)
@@ -78,7 +78,6 @@ static struct Receive {
        GtkObject *spinbtn_autochk_adj;
 
        GtkWidget *checkbtn_chkonstartup;
-       GtkWidget *checkbtn_noerrorpanel;
        GtkWidget *checkbtn_scan_after_inc;
 
 
@@ -216,6 +215,7 @@ static struct Interface {
        GtkWidget *checkbtn_immedexec;
        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *optmenu_recvdialog;
+       GtkWidget *checkbtn_no_recv_err_panel;
        GtkWidget *optmenu_nextunreadmsgdialog;
        GtkWidget *entry_pixmap_theme;
        GtkWidget *combo_pixmap_theme;
@@ -311,9 +311,6 @@ static PrefParam param[] = {
        {"check_on_startup", "FALSE", &prefs_common.chk_on_startup, P_BOOL,
         &receive.checkbtn_chkonstartup,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"noerrorpanel", "FALSE", &prefs_common.noerrorpanel, P_BOOL,
-        &receive.checkbtn_noerrorpanel,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"scan_all_after_inc", "FALSE", &prefs_common.scan_all_after_inc,
         P_BOOL, &receive.checkbtn_scan_after_inc,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -741,6 +738,9 @@ static PrefParam param[] = {
         &interface.optmenu_recvdialog,
         prefs_common_recv_dialog_set_data_from_optmenu,
         prefs_common_recv_dialog_set_optmenu},
+       {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
+        P_BOOL, &interface.checkbtn_no_recv_err_panel,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"nextunreadmsg_dialog", NULL, &prefs_common.next_unread_msg_dialog, P_ENUM,
         &interface.optmenu_nextunreadmsgdialog,
         prefs_nextunreadmsgdialog_set_data_from_optmenu,
@@ -1036,7 +1036,6 @@ static void prefs_receive_create(void)
        GtkWidget *spinbtn_autochk;
        GtkWidget *label_autochk2;
        GtkWidget *checkbtn_chkonstartup;
-       GtkWidget *checkbtn_noerrorpanel;
        GtkWidget *checkbtn_scan_after_inc;
 
 
@@ -1150,9 +1149,6 @@ static void prefs_receive_create(void)
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_chkonstartup,
                           _("Check new mail on startup"));
-
-       PACK_CHECK_BUTTON (vbox2, checkbtn_noerrorpanel,
-                          _("No error popup on receive error"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
                           _("Update all local folders after incorporation"));
 
@@ -1239,7 +1235,6 @@ static void prefs_receive_create(void)
        receive.spinbtn_autochk_adj = spinbtn_autochk_adj;
 
        receive.checkbtn_chkonstartup = checkbtn_chkonstartup;
-       receive.checkbtn_noerrorpanel = checkbtn_noerrorpanel;
        receive.checkbtn_scan_after_inc = checkbtn_scan_after_inc;
 
 
@@ -2627,6 +2622,7 @@ static void prefs_interface_create(void)
        GtkWidget *optmenu_recvdialog;
        GtkWidget *menu;
        GtkWidget *menuitem;
+       GtkWidget *checkbtn_no_recv_err_panel;
 
        GtkWidget *frame_addr;
        GtkWidget *vbox_addr;
@@ -2693,6 +2689,9 @@ static void prefs_interface_create(void)
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
 
+       PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
+                          _("No popup error dialog on receive error"));
+
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
@@ -2806,6 +2805,7 @@ static void prefs_interface_create(void)
        interface.checkbtn_openinbox          = checkbtn_openinbox;
        interface.checkbtn_immedexec          = checkbtn_immedexec;
        interface.optmenu_recvdialog          = optmenu_recvdialog;
+       interface.checkbtn_no_recv_err_panel  = checkbtn_no_recv_err_panel;
        interface.checkbtn_addaddrbyclick     = checkbtn_addaddrbyclick;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
        interface.combo_pixmap_theme          = combo_pixmap_theme;
index 1593f51..96e0746 100644 (file)
@@ -58,7 +58,6 @@ struct _PrefsCommon
        gboolean autochk_newmail;
        gint autochk_itv;
        gboolean chk_on_startup;
-       gboolean noerrorpanel;
        gboolean newmail_notify_auto;
        gboolean newmail_notify_manu;
        gchar   *newmail_notify_cmd;
@@ -221,6 +220,7 @@ struct _PrefsCommon
        gboolean open_inbox_on_inc;
        gboolean immediate_exec;
        RecvDialogMode recv_dialog_mode;
+       gboolean no_recv_err_panel;
        NextUnreadMsgDialogShow next_unread_msg_dialog;
        gboolean add_address_by_click;
        gchar *pixmap_theme_path;