commit 7324e70c1d80212f99eba44bd5bfa6e4e686be68
parent 26b9c58713129f5c56af4c04d4fe4105d08e6d2d
Author: Colin Leroy <colin@colino.net>
Date: Tue, 30 Sep 2008 15:34:25 +0000
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
Diffstat:
14 files changed, 43 insertions(+), 19 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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, <));
- 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, <));
+ 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
