correct path for webkit files in native win32

Changed files (3)

• modified src/Birdfont.vala
• modified src/FontDisplay.vala
• modified win32/wscript

Diff

diff --git a/src/Birdfont.vala b/src/Birdfont.valaindex dfc4a3f..4bc358b 100644--- a/src/Birdfont.vala+++ b/src/Birdfont.vala@@ -239,7 +239,8 @@ public static int run_export (string[] arg) { public static string wine_to_unix_path (string exec_path) { 	bool drive_c, drive_z; 	int i;-	string p;+	string p, q;+	File f; 	 	p = exec_path; 	p = p.replace ("\\", "/");@@ -254,7 +255,13 @@ public static string wine_to_unix_path (string exec_path) { 	}  	if (drive_c) {-		return (@"/home/$(Environment.get_user_name ())/.wine/drive_c/" + p).dup ();+		q = @"/home/$(Environment.get_user_name ())/.wine/drive_c/" + p;+		+		if (File.new_for_path (q).query_exists ()) {+			return q;+		} else {+			return p;+		} 	} 	 	if (drive_z) {diff --git a/src/FontDisplay.vala b/src/FontDisplay.valaindex 3cc598d..faa96af 100644--- a/src/FontDisplay.vala+++ b/src/FontDisplay.vala@@ -53,8 +53,6 @@ internal abstract class FontDisplay : GLib.Object { 		if (Supplement.win32) { 			wp = wine_to_unix_path (uri); 			-			print (@"wp: $wp\n");-			 			if (find_file (wp, "").query_exists ()) { 				uri = wp; 			}diff --git a/win32/wscript b/win32/wscriptindex cb60a41..7e991e5 100644--- a/win32/wscript+++ b/win32/wscript@@ -130,6 +130,18 @@ def build(bld): 		-static -o birdfont.exe""", source="../build/src/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link", always=True)  	bld(rule="""i686-w64-mingw32-gcc \+		./Main.o \+		./icon.res \+		-mthreads \+		-L./ \+		-L/usr/i686-w64-mingw32/sys-root/mingw/lib \+		-static -B -static -l birdfont.dll \+		-static -B static -lintl.dll -B static -l glib-2.0.dll -B static -l xml2.dll  \+		-B static -l gio-2.0.dll -B static -l soup-2.4.dll \+		-B static -l webkitgtk-1.0.dll  -B static -l gtk-win32-2.0.dll -B static -l gdk-win32-2.0.dll -B static -l atk-1.0.dll -B static -l gio-2.0.dll -B static -l pangowin32-1.0.dll -B static -l pangocairo-1.0.dll -B static -l gdk_pixbuf-2.0.dll -B static -l pango-1.0.dll -B static -l cairo.dll -B static -l gobject-2.0.dll -B static -l gmodule-2.0.dll -B static -l gthread-2.0.dll -B static -l glib-2.0.dll \+		-static -o birdfont_terminal.exe""", source="../build/src/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link terminal", always=True)++	bld(rule="""i686-w64-mingw32-gcc \ 		./BirdfontExport.o \ 		./icon.res \ 		-Wl,-subsystem,windows \@@ -144,6 +156,7 @@ def build(bld):  	bld(rule="mv birdfont-export.exe supplement/", depends_on='mingw link', always=True) 	bld(rule="mv birdfont.exe supplement/", depends_on='mingw link', always=True)+	bld(rule="mv birdfont_terminal.exe supplement/", depends_on='mingw link terminal', always=True) 	bld(rule="mv libbirdfont.dll supplement/", depends_on='mingw link', always=True)  	if bld.options.installer:@@ -239,9 +252,10 @@ Section "Uninstall"   RMDir "$INSTDIR\Birdfont"       Delete "$SMPROGRAMS\Birdfont\*.*"-     RMDir "$SMPROGRAMS\Birdfont" +  Delete "$DESKTOP\Birdfont.lnk"+ SectionEnd """) 	os.chdir('../../')