2005-05-19 [colin] 1.9.11cvs1
authorColin Leroy <colin@colino.net>
Thu, 19 May 2005 19:53:31 +0000 (19:53 +0000)
committerColin Leroy <colin@colino.net>
Thu, 19 May 2005 19:53:31 +0000 (19:53 +0000)
* src/procmsg.c
Fix compilation with gcc 2.9x

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/procmsg.c

index b4a29fb..a0b5369 100644 (file)
@@ -1,3 +1,8 @@
+2005-05-19 [colin]     1.9.11cvs1
+
+       * src/procmsg.c
+               Fix compilation with gcc 2.9x
+
 2005-05-19 [paul]      1.9.11
 
        1.9.11 released
index 399b9ff..80e5519 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.120 -r 1.382.2.121 src/compose.c; cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/gtk/gtkaspell.c; ) > 1.9.9cvs12.patchset
 ( cvs diff -u -r 1.274.2.38 -r 1.274.2.39 src/mainwindow.c; cvs diff -u -r 1.204.2.36 -r 1.204.2.37 src/prefs_common.c; cvs diff -u -r 1.103.2.15 -r 1.103.2.16 src/prefs_common.h; cvs diff -u -r 1.96.2.53 -r 1.96.2.54 src/textview.c; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 src/textview.h; ) > 1.9.9cvs13.patchset
 ( cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/gtk/inputdialog.c; ) > 1.9.9cvs14.patchset
+( cvs diff -u -r 1.150.2.23 -r 1.150.2.24 src/procmsg.c; ) > 1.9.11cvs1.patchset
index 5d12bb0..608b6c8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 18f3719..9db1131 100644 (file)
@@ -662,13 +662,6 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
        FILE *fp;
        int hnum;
        gchar buf[BUFFSIZE];
-       
-       g_return_val_if_fail(file != NULL, NULL);
-
-       if ((fp = fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
-               return NULL;
-       }
        static HeaderEntry qentry[] = {{"S:",    NULL, FALSE},
                                       {"SSV:",  NULL, FALSE},
                                       {"R:",    NULL, FALSE},
@@ -682,6 +675,13 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
                                       {"X-Sylpheed-Encrypt:", NULL, FALSE},
                                       {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
                                       {NULL,    NULL, FALSE}};
+       
+       g_return_val_if_fail(file != NULL, NULL);
+
+       if ((fp = fopen(file, "rb")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
+               return NULL;
+       }
 
        while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
               != -1) {