• R/O
  • SSH
  • HTTPS

mmaid: Commit


Commit MetaInfo

Revision147 (tree)
Zeit2013-12-31 01:02:12
Autoriwm

Log Message

modify g_file_get_contents

Ändern Zusammenfassung

Diff

--- mmaid/trunk/ChangeLog (revision 146)
+++ mmaid/trunk/ChangeLog (revision 147)
@@ -1,3 +1,11 @@
1+2013-12-31 Kazuki Iwamoto <iwm@maid.org>
2+
3+ * version 0.4.5
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 0.4.4
--- mmaid/trunk/gcommon/glibfile.c (revision 146)
+++ mmaid/trunk/gcommon/glibfile.c (revision 147)
@@ -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';
--- mmaid/trunk/gcommon/glibfile.h (revision 146)
+++ mmaid/trunk/gcommon/glibfile.h (revision 147)
@@ -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
--- mmaid/trunk/gcommon/Makefile.am (revision 146)
+++ mmaid/trunk/gcommon/Makefile.am (revision 147)
@@ -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
--- mmaid/trunk/configure.ac (revision 146)
+++ mmaid/trunk/configure.ac (revision 147)
@@ -5,7 +5,7 @@
55 dnl version number
66 MAJOR_VERSION=0
77 MINOR_VERSION=4
8-MICRO_VERSION=4
8+MICRO_VERSION=5
99 EXTRA_VERSION=
1010 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
1111
--- mmaid/trunk/po/ja.po (revision 146)
+++ mmaid/trunk/po/ja.po (revision 147)
@@ -4,9 +4,9 @@
44 #
55 msgid ""
66 msgstr ""
7-"Project-Id-Version: mmaid 0.4.4\n"
7+"Project-Id-Version: mmaid 0.4.5\n"
88 "Report-Msgid-Bugs-To: http://www.maid.org/\n"
9-"POT-Creation-Date: 2013-07-29 09:34+0900\n"
9+"POT-Creation-Date: 2013-09-29 23:49+0900\n"
1010 "PO-Revision-Date: 2004-01-04 23:14+0900\n"
1111 "Last-Translator: Kazuki Iwamoto <iwm@maid.org>\n"
1212 "Language-Team: Kazuki Iwamoto <iwm@maid.org>\n"
@@ -81,7 +81,7 @@
8181 msgid "_Bottom"
8282 msgstr "下(_B)"
8383
84-#: orz/orzpref.c:191 src/mmaid.c:100 src/sigmain.c:165
84+#: orz/orzpref.c:191 src/mmaid.c:100 src/sigmain.c:162
8585 msgid "Window Size"
8686 msgstr "ウインドウのサイズ"
8787
@@ -89,11 +89,11 @@
8989 msgid "Tab Position"
9090 msgstr "タブの位置"
9191
92-#: src/mmaid.c:97 src/sigmain.c:163
92+#: src/mmaid.c:97 src/sigmain.c:160
9393 msgid "History"
9494 msgstr "ファイルの履歴"
9595
96-#: src/mmaid.c:98 src/sigmain.c:164
96+#: src/mmaid.c:98 src/sigmain.c:161
9797 msgid "New File"
9898 msgstr "新規ファイルを開く"
9999
@@ -101,7 +101,7 @@
101101 msgid "Profile"
102102 msgstr "プロファイル"
103103
104-#: src/mmaid.c:101 src/sigmain.c:166
104+#: src/mmaid.c:101 src/sigmain.c:163
105105 msgid "Open Window"
106106 msgstr "新規ウインドウを開く"
107107
@@ -121,53 +121,53 @@
121121 msgid "Abort"
122122 msgstr "中断"
123123
124-#: src/add.c:49 src/add.c:88 src/command.c:1025 src/command.c:1045
125-#: src/edit.c:48 src/edit.c:82 src/root.c:73 src/root.c:93
124+#: src/add.c:48 src/add.c:87 src/command.c:1021 src/command.c:1041
125+#: src/edit.c:47 src/edit.c:81 src/root.c:72 src/root.c:92
126126 msgid "Browse"
127127 msgstr "参照"
128128
129-#: src/add.c:184 src/edit.c:585 src/root.c:219
129+#: src/add.c:183 src/edit.c:584 src/root.c:218
130130 msgid "_Browse..."
131131 msgstr "参照(_B)..."
132132
133-#: src/add.c:423 src/edit.c:535
133+#: src/add.c:422 src/edit.c:534
134134 msgid "T_rack"
135135 msgstr "トラック(_R)"
136136
137-#: src/add.c:439 src/edit.c:589 src/menu.c:30
137+#: src/add.c:438 src/edit.c:588 src/menu.c:30
138138 msgid "_File"
139139 msgstr "ファイル(_F)"
140140
141-#: src/add.c:440 src/edit.c:217
141+#: src/add.c:439 src/edit.c:216
142142 msgid "_Title"
143143 msgstr "タイトル(_T)"
144144
145-#: src/add.c:441 src/edit.c:218
145+#: src/add.c:440 src/edit.c:217
146146 msgid "_Artist"
147147 msgstr "アーチスト(_A)"
148148
149-#: src/add.c:442 src/edit.c:219
149+#: src/add.c:441 src/edit.c:218
150150 msgid "A_lbum"
151151 msgstr "アルバム(_L)"
152152
153-#: src/add.c:443 src/edit.c:220
153+#: src/add.c:442 src/edit.c:219
154154 msgid "_Year"
155155 msgstr "西暦(_Y)"
156156
157-#: src/add.c:444 src/edit.c:221
157+#: src/add.c:443 src/edit.c:220
158158 msgid "_Comment"
159159 msgstr "コメント(_C)"
160160
161-#: src/add.c:445 src/edit.c:222 src/export.c:138 src/menu.c:70
161+#: src/add.c:444 src/edit.c:221 src/export.c:138 src/menu.c:70
162162 msgid "_Genre"
163163 msgstr "ジャンル(_G)"
164164
165-#: src/add.c:446 src/command.c:335 src/edit.c:223 src/export.c:146
165+#: src/add.c:445 src/command.c:331 src/edit.c:222 src/export.c:146
166166 #: src/menu.c:71
167167 msgid "Character _Encoding"
168168 msgstr "文字符号化方式(_E)"
169169
170-#: src/command.c:155 src/command.c:455
170+#: src/command.c:151 src/command.c:451
171171 #, c-format
172172 msgid ""
173173 "%s\n"
@@ -180,39 +180,39 @@
180180 "\n"
181181 "上書きしますか?"
182182
183-#: src/command.c:261
183+#: src/command.c:257
184184 msgid "_Header"
185185 msgstr "ヘッダ(_H)"
186186
187-#: src/command.c:265
187+#: src/command.c:261
188188 msgid "_iDB File"
189189 msgstr "iDBファイル(_I)"
190190
191-#: src/command.c:267
191+#: src/command.c:263
192192 msgid "_Play List"
193193 msgstr "プレイリスト(_P)"
194194
195-#: src/command.c:269
195+#: src/command.c:265
196196 msgid "Relative"
197197 msgstr "相対"
198198
199-#: src/command.c:271
199+#: src/command.c:267
200200 msgid "Absolute"
201201 msgstr "絶対"
202202
203-#: src/command.c:273
203+#: src/command.c:269
204204 msgid "File Name"
205205 msgstr "ファイル名"
206206
207-#: src/command.c:330
207+#: src/command.c:326
208208 msgid "_Path"
209209 msgstr "パス(_P)"
210210
211-#: src/command.c:333
211+#: src/command.c:329
212212 msgid "_Separator"
213213 msgstr "区切り(_S)"
214214
215-#: src/command.c:512
215+#: src/command.c:508
216216 #, c-format
217217 msgid ""
218218 "File %s was edited.\n"
@@ -221,71 +221,71 @@
221221 "ファイル %s の内容が変更されています。\n"
222222 "保存されている状態に戻しますか?"
223223
224-#: src/command.c:551 src/export.c:104
224+#: src/command.c:547 src/export.c:104
225225 msgid "Export"
226226 msgstr "エクスポート"
227227
228-#: src/command.c:581
228+#: src/command.c:577
229229 msgid "File Open Error"
230230 msgstr "ファイルオープンエラー"
231231
232-#: src/command.c:587
232+#: src/command.c:583
233233 msgid "Have Tag"
234234 msgstr "タグがある"
235235
236-#: src/command.c:619
236+#: src/command.c:615
237237 msgid "Success"
238238 msgstr "成功"
239239
240-#: src/command.c:622
240+#: src/command.c:618
241241 msgid "Invalid Character Encoding of Title"
242242 msgstr "タイトルが不正な文字符号化方式"
243243
244-#: src/command.c:625
244+#: src/command.c:621
245245 msgid "Invalid Character Encoding of Artist"
246246 msgstr "アーチストが不正な文字符号化方式"
247247
248-#: src/command.c:628
248+#: src/command.c:624
249249 msgid "Invalid Character Encoding of Album"
250250 msgstr "アルバムが不正な文字符号化方式"
251251
252-#: src/command.c:631
252+#: src/command.c:627
253253 msgid "Invalid Character Encoding of Year"
254254 msgstr "西暦が不正な文字符号化方式"
255255
256-#: src/command.c:634
256+#: src/command.c:630
257257 msgid "Invalid Character Encoding of Comment"
258258 msgstr "コメントが不正な文字符号化方式"
259259
260-#: src/command.c:637
260+#: src/command.c:633
261261 msgid "Invalid Length of Title"
262262 msgstr "タイトルが長すぎる"
263263
264-#: src/command.c:640
264+#: src/command.c:636
265265 msgid "Invalid Length of Artist"
266266 msgstr "アーチストが長すぎる"
267267
268-#: src/command.c:643
268+#: src/command.c:639
269269 msgid "Invalid Length of Album"
270270 msgstr "アルバムが長すぎる"
271271
272-#: src/command.c:646
272+#: src/command.c:642
273273 msgid "Invalid Length of Year"
274274 msgstr "西暦が長すぎる"
275275
276-#: src/command.c:649
276+#: src/command.c:645
277277 msgid "Invalid Length of Comment"
278278 msgstr "コメントが長すぎる"
279279
280-#: src/command.c:652
280+#: src/command.c:648
281281 msgid "Error"
282282 msgstr "エラー"
283283
284-#: src/command.c:1090
284+#: src/command.c:1086
285285 msgid "Search"
286286 msgstr "検索"
287287
288-#: src/edit.c:202 src/menu.c:120
288+#: src/edit.c:201 src/menu.c:120
289289 msgid "Edit"
290290 msgstr "編集"
291291
@@ -772,7 +772,7 @@
772772 msgid "Stop"
773773 msgstr "停止(_S)"
774774
775-#: src/menu.c:114 src/root.c:205
775+#: src/menu.c:114 src/root.c:204
776776 msgid "Root"
777777 msgstr "ルート"
778778
@@ -836,11 +836,11 @@
836836 msgid "_Stop"
837837 msgstr "停止(_S)"
838838
839-#: src/root.c:318
839+#: src/root.c:317
840840 msgid "_Find Path"
841841 msgstr "検索パス(_F)"
842842
843-#: src/root.c:319
843+#: src/root.c:318
844844 msgid "_Replace Path"
845845 msgstr "置換パス(_R)"
846846
Show on old repository browser