sync with 0.8.5cvs21
authorPaul Mangan <paul@claws-mail.org>
Mon, 11 Nov 2002 08:38:54 +0000 (08:38 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 11 Nov 2002 08:38:54 +0000 (08:38 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/inc.c
src/inc.h

index d08dace16c8ff00e1d89ecdb77a98fbf5ca353b0..2ac8f40c2295b8014eb3dd67ca348c4460d5e2e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-11
+
+       * src/inc.[ch]: added INC_IO_ERROR to IncState. Also added its
+         corresponding error message.
+         inc_pop3_session_do(): set INC_IO_ERROR instead of INC_NOSPACE
+         on PS_IOERR.
+
 2002-11-07
 
        * src/prefs_account.[ch]: removed prefs_account_save_config() since
index 1af9193f7923dcb00817d7fc39998df96b372e6c..9ca35b10c2554c294f6d69c73d3a5dc84772b13f 100644 (file)
@@ -1,3 +1,8 @@
+2002-11-11 [paul]      0.8.5claws119
+
+       * sync with 0.8.5cvs21
+               see ChangeLog 2002-11-11
+
 2002-11-10 [jens]      0.8.5claws118
 
        * src/folder.c
index 2e6458e3f8fc154397bc5d75ffd93e138d153545..e625ad58dacdaf433d15804a0b98af6b3d89c2fb 100644 (file)
@@ -1,3 +1,10 @@
+2002-11-11
+
+       * src/inc.[ch]: INC_IO_ERROR ¤ò IncState ¤ËÄɲᣤ½¤ì¤ËÂбþ¤¹¤ë
+         ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤âÄɲá£
+         inc_pop3_session_do(): PS_IOERR ¤Î¤È¤­ INC_NOSPACE ¤ÎÂå¤ï¤ê¤Ë
+         INC_IO_ERROR ¤ò¥»¥Ã¥È¡£
+
 2002-11-07
 
        * src/prefs_account.[ch]: »È¤ï¤ì¤Æ¤¤¤Ê¤¤¤¿¤á
index 4e18727ad3dfaada20a61a359e1d68226ae6bf43..8ec4b1cbed9684281591bc5fe8b709b03e93cbf2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws118
+EXTRA_VERSION=claws119
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 4b2439b9a78798ceeb15e942c2e2c2f0cbda0516..8b084a8c2db6847db8fba16c1d6dec9d3abe6bf2 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -549,7 +549,8 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                        gtk_clist_set_text(clist, num, 2, _("Locked"));
                        break;
                case INC_ERROR:
-               case INC_NOSPACE:
+               case INC_NO_SPACE:
+               case INC_IO_ERROR:
                case INC_SOCKET_ERROR:
                        gtk_clist_set_pixmap(clist, num, 0, errorxpm, errorxpmmask);
                        gtk_clist_set_text(clist, num, 2, _("Error"));
@@ -630,7 +631,8 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 
                if (inc_state != INC_SUCCESS && inc_state != INC_CANCEL) {
                        error_num++;
-                       if (inc_state == INC_NOSPACE || inc_state == INC_SOCKET_ERROR) {
+                       if (inc_state == INC_NO_SPACE ||
+                           inc_state == INC_IO_ERROR) {
                                inc_put_error(inc_state);
                                break;
                        }
@@ -824,7 +826,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                session->inc_state = INC_AUTH_FAILED;
                break;
        case PS_IOERR:
-               session->inc_state = INC_NOSPACE;
+               session->inc_state = INC_IO_ERROR;
                break;
        case PS_SOCKET:
                session->inc_state = INC_SOCKET_ERROR;
@@ -1017,9 +1019,12 @@ static void inc_put_error(IncState istate)
                        alertpanel_error
                                (_("Error occurred while processing mail."));
                break;
-       case INC_NOSPACE:
+       case INC_NO_SPACE:
                alertpanel_error(_("No disk space left."));
                break;
+       case INC_IO_ERROR:
+               alertpanel_error(_("Can't write file."));
+               break;
        case INC_SOCKET_ERROR:
                alertpanel_error(_("Socket error."));
                break;
index 085ac19f4aae8109b5a9efd385ed4d01304f2d0c..2e9e27be63839d2eb57a350a66ce5d61f927b762 100644 (file)
--- a/src/inc.h
+++ b/src/inc.h
@@ -44,7 +44,8 @@ typedef enum
        INC_AUTH_FAILED,
        INC_LOCKED,
        INC_ERROR,
-       INC_NOSPACE,
+       INC_NO_SPACE,
+       INC_IO_ERROR,
        INC_SOCKET_ERROR,
        INC_CANCEL
 } IncState;