提交: 0c3ffbf5b1e07d7a6e584799207bcd8faf77faa7 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修订版: 0c3ffbf5b1e07d7a6e584799207bcd8faf77faa7 (tree)
• 时间: 2004-07-18 04:23:16
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Image path name patch

更改概述

• modified: ChangeLog
• modified: objects/standard/image.c

差异

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* objects/standard/image.c (image_load): Use path of diagram
+	rather than running directory as base for image file place.
+
 2004-07-17 Sagar Rastogi <[e-mail]>
 
 	* app/disp_callbacks.c: Fixed #144962 (also in KNOWN_BUGS),

--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -692,9 +692,11 @@ image_load(ObjectNode obj_node, int version, const char *filename)
       char *temp_string;
 
       temp_string = g_malloc(strlen(diafile_dir) +
-			     strlen(image->file) +1);
+	                     strlen(G_DIR_SEPARATOR_S) +
+			     strlen(image->file) + 1);
 
       strcpy(temp_string, diafile_dir);
+      strcat(temp_string, G_DIR_SEPARATOR_S);
       strcat(temp_string, image->file);
 
       image->image = dia_image_load(temp_string);