• R/O
  • SSH
  • HTTPS

tmaid: Commit


Commit MetaInfo

Revisão216 (tree)
Hora2013-12-31 01:02:46
Autoriwm

Mensagem de Log

modify g_file_get_contents

Mudança Sumário

Diff

--- tmaid/trunk/ChangeLog (revision 215)
+++ tmaid/trunk/ChangeLog (revision 216)
@@ -1,3 +1,11 @@
1+2013-12-31 Kazuki Iwamoto <iwm@maid.org>
2+
3+ * version 2.7.8
4+
5+2013-12-31 Kazuki Iwamoto <iwm@maid.org>
6+
7+ * gcommon/glibfile.c: modify g_file_get_contents
8+
19 2013-09-29 Kazuki Iwamoto <iwm@maid.org>
210
311 * version 2.7.7
--- tmaid/trunk/gcommon/glibfile.c (revision 215)
+++ tmaid/trunk/gcommon/glibfile.c (revision 216)
@@ -46,7 +46,7 @@
4646 if (fseek (fp, 0, SEEK_END) == 0)
4747 {
4848 fs = ftell (fp);
49- if (fs >= 0)
49+ if (fs >= 0 && fseek (fp, 0, SEEK_SET) == 0)
5050 {
5151 buf = g_malloc (fs + 1);
5252 buf[fs] = '\0';
--- tmaid/trunk/gcommon/glibfile.h (revision 215)
+++ tmaid/trunk/gcommon/glibfile.h (revision 216)
@@ -102,11 +102,8 @@
102102 #endif /* not GLIB_CHECK_VERSION(2,8,0) */
103103 #if ! GLIB_CHECK_VERSION(2,18,0)
104104 # ifdef G_OS_WIN32
105-# include <sys/utime.h>
105+# include <sys/utime.h>
106106 # endif /* G_OS_WIN32 */
107-# ifdef HAVE_UTIME_H
108-# include <utime.h>
109-# endif /* HAVE_UTIME_H */
110107 gint g_utime (const gchar *filename, struct utimbuf *utb);
111108 #endif /* not GLIB_CHECK_VERSION(2,18,0) */
112109
--- tmaid/trunk/gcommon/Makefile.am (revision 215)
+++ tmaid/trunk/gcommon/Makefile.am (revision 216)
@@ -25,10 +25,6 @@
2525 gtk2widget.c gtk2widget.h \
2626 gdk2keysyms.h
2727
28-AM_CPPFLAGS = \
29- -DLOCALEDIR=\""$(localedir)"\" \
30- -DSYSCONFDIR=\""$(sysconfdir)"\"
31-
3228 INCLUDES = \
3329 $(GTK_CFLAGS)
3430
--- tmaid/trunk/configure.ac (revision 215)
+++ tmaid/trunk/configure.ac (revision 216)
@@ -5,7 +5,7 @@
55 dnl version number
66 MAJOR_VERSION=2
77 MINOR_VERSION=7
8-MICRO_VERSION=7
8+MICRO_VERSION=8
99 EXTRA_VERSION=
1010 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
1111
--- tmaid/trunk/po/ja.po (revision 215)
+++ tmaid/trunk/po/ja.po (revision 216)
@@ -4,7 +4,7 @@
44 #
55 msgid ""
66 msgstr ""
7-"Project-Id-Version: tmaid 2.7.6\n"
7+"Project-Id-Version: tmaid 2.7.8\n"
88 "Report-Msgid-Bugs-To: http://www.maid.org/\n"
99 "POT-Creation-Date: 2013-09-29 23:49+0900\n"
1010 "PO-Revision-Date: 2002-08-11 18:10+0900\n"
Show on old repository browser