fix windows webkit issues

Changed files (6)

• modified src/FontDisplay.vala
• modified src/Icons.vala
• modified src/MainWindow.vala
• modified src/MenuTab.vala
• modified src/OpenFontFormatWriter.vala
• modified src/Preview.vala

Diff

diff --git a/src/FontDisplay.vala b/src/FontDisplay.valaindex bf7826f..d9a1fe8 100644--- a/src/FontDisplay.vala+++ b/src/FontDisplay.vala@@ -49,7 +49,7 @@ public abstract class FontDisplay : GLib.Object { 	} 	 	public virtual string get_html_file () {-		return "";+		return "index.html"; 	} 	 	public virtual string get_html () {diff --git a/src/Icons.vala b/src/Icons.valaindex 6a8e4df..7c5da21 100644--- a/src/Icons.vala+++ b/src/Icons.vala@@ -70,7 +70,7 @@ class Icons {  		f = find_file ("/usr/share/supplement/icons/", name); 		if (likely (f.query_exists ())) return f;-							+			 		return f; 	} 	diff --git a/src/MainWindow.vala b/src/MainWindow.valaindex d6dcd10..58fd6e4 100644--- a/src/MainWindow.vala+++ b/src/MainWindow.vala@@ -82,6 +82,7 @@ public class MainWindow : Gtk.Window { 		tabs.signal_tab_selected.connect ((f, tab) => {
 			bool n;
 			File layout_dir;
+			File layout_uri;
 			string uri;
 			FontDisplay fd = tab.get_display ();
 			
@@ -96,9 +97,12 @@ public class MainWindow : Gtk.Window { 				uri = fd.get_uri ();
 				
 				if (uri == "") {
-					uri = @"file://$((!) layout_dir.get_path ())/$(fd.get_html_file ())";
+					layout_uri = layout_dir.get_child (fd.get_html_file ());
+					uri = @"file://$((!) layout_uri.get_path ())";
 				}
 				
+				print (@"base uri: $uri\n");
+				
 				if (fd.get_html () == "") {
 					html_canvas.load_uri (uri);
 				} else {
diff --git a/src/MenuTab.vala b/src/MenuTab.valaindex 81a905b..d9c0372 100644--- a/src/MenuTab.vala+++ b/src/MenuTab.vala@@ -106,10 +106,6 @@ class MenuTab : FontDisplay { 		return true; 	} -	public override string get_html_file () {-		return "";-	}- 	public override string get_html () { 		Font f = Supplement.get_current_font (); 		StringBuilder c = new StringBuilder ();diff --git a/src/OpenFontFormatWriter.vala b/src/OpenFontFormatWriter.valaindex f4dec47..c433cf7 100644--- a/src/OpenFontFormatWriter.vala+++ b/src/OpenFontFormatWriter.vala@@ -709,7 +709,6 @@ class GlyfTable : Table { 	double total_width = 0;
 	int non_zero_glyphs = 0;
 
-	Mutex read_lock;
 	int64 next_index = -1;
 	
 	public GlyfTable (LocaTable l) {
@@ -717,7 +716,6 @@ class GlyfTable : Table { 		loca_table = l;
 		location_offsets = new List<uint32> ();
 		glyphs = new List<Glyph> ();
-		read_lock = new Mutex ();
 	}	
 
 	public int get_gid (string name) {
diff --git a/src/Preview.vala b/src/Preview.valaindex f9d23b5..745832e 100644--- a/src/Preview.vala+++ b/src/Preview.vala@@ -34,7 +34,8 @@ class Preview : FontDisplay {  	public override void selected_canvas () { 		ExportTool.export_all ();-		MainWindow.get_webview ().load_uri (get_uri ());+		string uri = get_uri ();+		MainWindow.get_webview ().load_uri (uri); 	}  	public override string get_uri () {