2008-09-30 [colin] 3.5.0cvs140

	* src/addrbook.c
	* src/addrharvest.c
	* src/compose.c
	* src/jpilot.c
	* src/mh.c
	* src/prefs_themes.c
	* src/procheader.c
	* src/procmime.c
	* src/summaryview.c
	* src/common/utils.c
	* src/gtk/sslcertwindow.c
		Win32: Fix time usage; use g_stat

diff --git a/ChangeLog b/ChangeLog
index 36d696193c127afafb364a3774609bc31181dc72..6d438269fc8af5397cb0f47d58f7ae3ae71dabb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-09-30 [colin]     3.5.0cvs140
+
+       * src/addrbook.c
+       * src/addrharvest.c
+       * src/compose.c
+       * src/jpilot.c
+       * src/mh.c
+       * src/prefs_themes.c
+       * src/procheader.c
+       * src/procmime.c
+       * src/summaryview.c
+       * src/common/utils.c
+       * src/gtk/sslcertwindow.c
+               Win32: Fix time usage; use g_stat
+
 2008-09-29 [colin]     3.5.0cvs139
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index c6cc6d5256bc8f71c5e6a67ecd99d1bcf24a77cd..4cf39bbf73997d2e197711fc4534f31d4ae64a46 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3551,3 +3551,4 @@
 ( cvs diff -u -r 1.12.2.17 -r 1.12.2.18 po/en_GB.po;  ) > 3.5.0cvs137.patchset
 ( cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/folder_item_prefs.h;  cvs diff -u -r 1.75.2.60 -r 1.75.2.61 src/matcher.c;  cvs diff -u -r 1.52.2.69 -r 1.52.2.70 src/prefs_folder_item.c;  cvs diff -u -r 1.43.2.76 -r 1.43.2.77 src/prefs_matcher.c;  cvs diff -u -r 1.395.2.391 -r 1.395.2.392 src/summaryview.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/string_match.c;  cvs diff -u -r 1.36.2.150 -r 1.36.2.151 src/common/utils.c;  ) > 3.5.0cvs138.patchset
 ( cvs diff -u -r 1.36.2.151 -r 1.36.2.152 src/common/utils.c;  ) > 3.5.0cvs139.patchset
+( cvs diff -u -r 1.22.2.20 -r 1.22.2.21 src/addrbook.c;  cvs diff -u -r 1.6.10.18 -r 1.6.10.19 src/addrharvest.c;  cvs diff -u -r 1.382.2.480 -r 1.382.2.481 src/compose.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/jpilot.c;  cvs diff -u -r 1.79.2.65 -r 1.79.2.66 src/mh.c;  cvs diff -u -r 1.3.2.58 -r 1.3.2.59 src/prefs_themes.c;  cvs diff -u -r 1.47.2.48 -r 1.47.2.49 src/procheader.c;  cvs diff -u -r 1.49.2.117 -r 1.49.2.118 src/procmime.c;  cvs diff -u -r 1.395.2.392 -r 1.395.2.393 src/summaryview.c;  cvs diff -u -r 1.36.2.152 -r 1.36.2.153 src/common/utils.c;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/gtk/sslcertwindow.c;  ) > 3.5.0cvs140.patchset

diff --git a/configure.ac b/configure.ac
index d3f1c94ecba07756ab6303d5078c93a8a98c3813..498c4f5549c1a280d9453d7d68461a1067b341e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=139
+EXTRA_VERSION=140
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addrbook.c b/src/addrbook.c
index 7321dec11bd96c5198250b2074358d318a5a88fd..1771d1aac937bfebd6296f9152e24a1d07937d4d 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -1847,7 +1847,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
 
                strcpy(buf, adbookdir);
                strcat( buf, dir_name );
-               stat(buf, &statbuf);
+               g_stat(buf, &statbuf);
                if (S_ISREG(statbuf.st_mode)) {
                        if (strncmp(
                                dir_name,

diff --git a/src/addrharvest.c b/src/addrharvest.c
index c44f4ab16b733782941851c20304f28b3d49129a..94c6b0d4ea62a854b393216976d69450b785dc22 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -720,7 +720,7 @@ static void addrharvest_harvest_dir(
        /* Process directory */
        chdir( dir );
        while( ( d = readdir( dp ) ) != NULL ) {
-               stat( d->d_name, &s );
+               g_stat( d->d_name, &s );
                if( S_ISDIR( s.st_mode ) ) {
                        if( harvester->folderRecurse ) {
                                if( strstr( DIR_IGNORE, d->d_name ) != NULL )

diff --git a/src/common/utils.c b/src/common/utils.c
index c461aec242b6051f526fcfa6053d8fa9e6e5ffc9..94b84a406028db6cf89b3a12c51851f13dd66e35 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3461,7 +3461,7 @@ time_t tzoffset_sec(time_t *now)
        struct tm buf1, buf2;
 #endif
 #ifdef G_OS_WIN32
-       if (now && *now == -1)
+       if (now && *now < 0)
                return 0;
 #endif 
        gmt = *gmtime_r(now, &buf1);
@@ -3497,7 +3497,7 @@ gchar *tzoffset(time_t *now)
        struct tm buf1, buf2;
 #endif
 #ifdef G_OS_WIN32
-       if (now && *now == -1)
+       if (now && *now < 0)
                return 0;
 #endif
        gmt = *gmtime_r(now, &buf1);

diff --git a/src/compose.c b/src/compose.c
index d4aa60257ab15b07e7cb8f29a9d1e3d5241794cb..f3f83fcf72a6b162d0a1ac2b3b010f72f21d35fb 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5687,7 +5687,7 @@ static void compose_add_attachments(Compose *compose, MimeInfo *parent)
                mimepart->tmp = FALSE; /* or we destroy our attachment */
                mimepart->offset = 0;
 
-               stat(ainfo->file, &statbuf);
+               g_stat(ainfo->file, &statbuf);
                mimepart->length = statbuf.st_size;
 
                type = g_strdup(ainfo->content_type);

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index ea0b4c97e6650dce585b40e21125285dad5c5740..c8695070252cf2f59380dc6fe7c5d8f8cc378812 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -197,8 +197,11 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 #endif 
 
        memset(buf, 0, sizeof(buf));
-       strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
-       exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
+       if (exp_time_t > 0) {
+               strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
+               exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
+       } else
+               exp_date = g_strdup("");
 
        /* fingerprint */
 #if USE_OPENSSL

diff --git a/src/jpilot.c b/src/jpilot.c
index d049314ca2c4cd33829393616d627d6d70f12998..e2f72ce91766dc7c3c666ec42ac319811323d4c3 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -363,7 +363,7 @@ static gboolean jpilot_mark_files( JPilotFile *pilotFile ) {
        pilotFile->pc3ModifyTime = 0;
        pcFile = jpilot_get_pc3_file( pilotFile );
        if( pcFile == NULL ) return retVal;
-       if( 0 == stat( pcFile, &filestat ) ) {
+       if( 0 == g_stat( pcFile, &filestat ) ) {
                pilotFile->havePC3 = TRUE;
                pilotFile->pc3ModifyTime = filestat.st_mtime;
                retVal = TRUE;
@@ -392,7 +392,7 @@ static gboolean jpilot_check_files( JPilotFile *pilotFile ) {
        pcFile = jpilot_get_pc3_file( pilotFile );
        if( pcFile == NULL ) return FALSE;
 
-       if( 0 == stat( pcFile, &filestat ) ) {
+       if( 0 == g_stat( pcFile, &filestat ) ) {
                if( filestat.st_mtime == pilotFile->pc3ModifyTime ) retVal = FALSE;
        }
        g_free( pcFile );

diff --git a/src/mh.c b/src/mh.c
index 19debf03b0f68e6dd9b77fce7e1ef2ec30f751c3..672cb34977e92e8051b39e9a0af61a363489f2ee 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -212,7 +212,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
        path = folder_item_get_path(item);
        g_return_val_if_fail(path != NULL, FALSE);
 
-       if (stat(path, &s) < 0) {
+       if (g_stat(path, &s) < 0) {
                FILE_OP_ERROR(path, "stat");
                g_free(path);
                return FALSE;
@@ -1453,7 +1453,7 @@ static void mh_set_mtime(Folder *folder, FolderItem *item)
 
        g_return_if_fail(path != NULL);
 
-       if (stat(path, &s) < 0) {
+       if (g_stat(path, &s) < 0) {
                FILE_OP_ERROR(path, "stat");
                g_free(path);
                return;

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index cb99e27585a1d7d0dd0b907ac4b4afa9ca62df35..90d126a001d529ebf9300b3c1cd8b910e7b8dd78 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -163,7 +163,7 @@ static void prefs_themes_file_stats(const gchar *filename, gpointer data)
        DirInfo    *di = (DirInfo *)data;
        gint        len;
        
-       if (0 == stat(filename, &s) && 0 != S_ISREG(s.st_mode)) {
+       if (0 == g_stat(filename, &s) && 0 != S_ISREG(s.st_mode)) {
                di->bytes += s.st_size;
                di->files++;
                len = strlen(filename);

diff --git a/src/procheader.c b/src/procheader.c
index 392b55f3cfa5d9b0358974e95bc206eaae7d2998..fed0c86c061a9285633a41f051994a54cc93b21d 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -327,7 +327,7 @@ MsgInfo *procheader_parse_file(const gchar *file, MsgFlags flags,
        FILE *fp;
        MsgInfo *msginfo;
 
-       if (stat(file, &s) < 0) {
+       if (g_stat(file, &s) < 0) {
                FILE_OP_ERROR(file, "stat");
                return NULL;
        }
@@ -966,7 +966,12 @@ void procheader_date_get_localtime(gchar *dest, gint len, const time_t timer)
        const gchar *src_codeset, *dest_codeset;
        struct tm buf;
 
-       lt = localtime_r(&timer, &buf);
+       if (timer > 0)
+               lt = localtime_r(&timer, &buf);
+       else {
+               time_t dummy = 1;
+               lt = localtime_r(&dummy, &buf);
+       }
 
        if (prefs_common.date_format)
                fast_strftime(dest, len, prefs_common.date_format, lt);

diff --git a/src/procmime.c b/src/procmime.c
index c8e1fbfa827914faeaf7cf4f8f963ed00925e1c3..0f25de0906944bbe24b37cfdc4c1dcf099f78c41 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -436,7 +436,7 @@ gboolean procmime_decode_content(MimeInfo *mimeinfo)
                return FALSE;
        }
 
-       stat(tmpfilename, &statbuf);
+       g_stat(tmpfilename, &statbuf);
        if (mimeinfo->tmp && (mimeinfo->data.filename != NULL))
                claws_unlink(mimeinfo->data.filename);
        g_free(mimeinfo->data.filename);
@@ -586,7 +586,7 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, EncodingType encoding)
                        g_free(mimeinfo->data.mem);
        }
 
-       stat(tmpfilename, &statbuf);
+       g_stat(tmpfilename, &statbuf);
        mimeinfo->content = MIMECONTENT_FILE;
        mimeinfo->data.filename = tmpfilename;
        mimeinfo->tmp = TRUE;
@@ -2007,7 +2007,7 @@ static MimeInfo *procmime_scan_file_with_offset(const gchar *filename, int offse
        MimeInfo *mimeinfo;
        struct stat buf;
 
-       stat(filename, &buf);
+       g_stat(filename, &buf);
 
        mimeinfo = procmime_mimeinfo_new();
        mimeinfo->content = MIMECONTENT_FILE;

diff --git a/src/summaryview.c b/src/summaryview.c
index 19efbe8c81a8798dc728b84a5ae0cafafcdbcb1e..ed1695c2beb5f41611735c80a1074c3767f7569b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3307,7 +3307,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        /* slow! */
        if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible || 
            (vert && prefs_common.two_line_vert)) {
-               if (msginfo->date_t) {
+               if (msginfo->date_t && msginfo->date_t > 0) {
                        procheader_date_get_localtime(date_modified,
                                                      sizeof(date_modified),
                                                      msginfo->date_t);