diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2011-01-24 09:37:13 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2011-01-24 09:37:13 +0000 |
| commit | 4e94805f2abd952eaaed7cf9990ddf13cbc1e66f (patch) | |
| tree | b20801de407618068da21c5ddaf6e818466d1707 | |
| parent | 38f46204d02b2aaf3e61b480c13ab92bcedfde87 (diff) | |
fixed procmime_get_part_fp_fp(). updated LegalCopyright. updated version to 3.1.0.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2826 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libsylph/procmime.c | 8 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 1 | ||||
| -rw-r--r-- | src/sylpheed.rc.in | 2 |
5 files changed, 15 insertions, 9 deletions
@@ -1,5 +1,12 @@ 2011-01-24 + * src/prefs_common_dialog.c: removed a warning. + * src/sylpheed.rc.in: updated LegalCopyright. + * libsylph/procmime.c: procmime_get_part_fp_fp(): fixed return value + on error. + +2011-01-24 + * version 3.1.0rc 2011-01-24 diff --git a/configure.in b/configure.in index 53066b1f..3dfc7612 100644 --- a/configure.in +++ b/configure.in @@ -9,12 +9,12 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=rc -BUILD_REVISION=1112 +EXTRA_VERSION= +BUILD_REVISION=1113 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl define if this is a development release -DEVEL_VERSION=1 +dnl DEVEL_VERSION=1 dnl set $target AC_CANONICAL_SYSTEM diff --git a/libsylph/procmime.c b/libsylph/procmime.c index 6815baa5..8fdb5bf9 100644 --- a/libsylph/procmime.c +++ b/libsylph/procmime.c @@ -1156,19 +1156,19 @@ FILE *procmime_get_part_fp_fp(FILE *outfp, FILE *infp, MimeInfo *mimeinfo) { gchar buf[BUFFSIZE]; - g_return_val_if_fail(infp != NULL, -1); - g_return_val_if_fail(mimeinfo != NULL, -1); + g_return_val_if_fail(infp != NULL, NULL); + g_return_val_if_fail(mimeinfo != NULL, NULL); if (fseek(infp, mimeinfo->fpos, SEEK_SET) < 0) { FILE_OP_ERROR("procmime_get_part_fp()", "fseek"); - return -1; + return NULL; } while (fgets(buf, sizeof(buf), infp) != NULL) if (buf[0] == '\r' || buf[0] == '\n') break; if ((outfp = procmime_decode_content(outfp, infp, mimeinfo)) == NULL) { - return -1; + return NULL; } return outfp; diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index e28ec172..36554540 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -945,7 +945,6 @@ static void prefs_send_create(void) GtkWidget *checkbtn_savemsg; GtkWidget *checkbtn_filter_sent; GtkWidget *checkbtn_recipients_autoreg; - GtkWidget *vbox3; GtkWidget *checkbtn_show_send_dialog; GtkWidget *label; GtkWidget *checkbtn_check_attach; diff --git a/src/sylpheed.rc.in b/src/sylpheed.rc.in index 3b0226e2..6ab9960d 100644 --- a/src/sylpheed.rc.in +++ b/src/sylpheed.rc.in @@ -15,7 +15,7 @@ BEGIN VALUE "FileDescription", "Sylpheed\0" VALUE "FileVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@.@BUILD_REVISION@\0" VALUE "InternalName", "sylpheed\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2010 Hiroyuki Yamamoto\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2011 Hiroyuki Yamamoto\0" VALUE "OriginalFilename", "sylpheed.exe\0" VALUE "ProductName", "Sylpheed\0" VALUE "ProductVersion", "@VERSION@\0" |