Clone in a terminal:
Commit 2133ae4
Johan Mattsson - 2014-08-15T13:14:10+00:00
2133ae4aa24a490b431a5d52d0e184de4d012f29johan.mattsson.m@gmail.com

Add debugging symbols

Changed files (6)

Diff

diff --git a/libbirdfont/ExportCallback.vala b/libbirdfont/ExportCallback.valaindex 0f71b0b..e32ce6e 100644--- a/libbirdfont/ExportCallback.vala+++ b/libbirdfont/ExportCallback.vala@@ -24,7 +24,7 @@ public class ExportCallback : GLib.Object { 	public void export_fonts_in_background () { 		Font font = BirdFont.get_current_font ();		 		if (font.font_file == null) {-			MenuTab.save_callback = new SaveCallback ();+			MenuTab.set_save_callback (new SaveCallback ()); 			MenuTab.save_callback.file_saved.connect (() => { 				MainWindow.native_window.export_font (); 			});diff --git a/libbirdfont/FileTab.vala b/libbirdfont/FileTab.valaindex 45a035c..44cfe39 100644--- a/libbirdfont/FileTab.vala+++ b/libbirdfont/FileTab.vala@@ -85,7 +85,7 @@ public class FileTab : FontDisplay { 				return; 			} 			-			MenuTab.save_callback = new SaveCallback ();+			MenuTab.set_save_callback (new SaveCallback ()); 			MenuTab.save_callback.file_saved.connect (() => { 				dialog.signal_discard (); 			});diff --git a/libbirdfont/LoadCallback.vala b/libbirdfont/LoadCallback.valaindex 3503d48..222ccf6 100644--- a/libbirdfont/LoadCallback.vala+++ b/libbirdfont/LoadCallback.vala@@ -40,7 +40,7 @@ public class LoadCallback : GLib.Object {  		dialog.signal_save.connect (() => { 			MainWindow.close_all_tabs ();-			MenuTab.save_callback = new SaveCallback ();+			MenuTab.set_save_callback (new SaveCallback ()); 			MenuTab.save_callback.file_saved.connect (() => { 				load_new_font (); 			});diff --git a/libbirdfont/MenuTab.vala b/libbirdfont/MenuTab.valaindex d11adc0..e9bb624 100644--- a/libbirdfont/MenuTab.vala+++ b/libbirdfont/MenuTab.vala@@ -34,12 +34,22 @@ public class MenuTab : FontDisplay {  	public MenuTab () { 		save_callback = new SaveCallback ();+		save_callback.is_done = true;+		 		load_callback = new LoadCallback (); 		export_callback = new ExportCallback (); 		 		suppress_event = false; 	} +	public static void set_save_callback (SaveCallback c) {+		if (!save_callback.is_done) {+			warning ("Prevoius save command has not finished");+		}+		+		save_callback = c;+	}+	 	public static void start_background_thread () { 		if (!set_suppress_event (true)) { 			warning ("suppressed event");@@ -206,23 +216,23 @@ public class MenuTab : FontDisplay { 	}  	public static void quit () {-		SaveDialogListener dialog = new SaveDialogListener ();-		Font font = BirdFont.get_current_font ();-		-		Preferences.save ();-		 		if (suppress_event) { 			warn_if_test ("Event suppressed"); 			return; 		}++		SaveDialogListener dialog = new SaveDialogListener ();+		Font font = BirdFont.get_current_font (); 		+		Preferences.save ();+				 		dialog.signal_discard.connect (() => { 			ensure_main_loop_is_empty (); 			MainWindow.native_window.quit (); 		});  		dialog.signal_save.connect (() => {-			MenuTab.save_callback = new SaveCallback ();+			MenuTab.set_save_callback (new SaveCallback ()); 			MenuTab.save_callback.file_saved.connect (() => { 				ensure_main_loop_is_empty (); 				MainWindow.native_window.quit ();@@ -348,7 +358,7 @@ public class MenuTab : FontDisplay { 		MainWindow.get_tab_bar ().add_unique_tab (new KerningList ()); 	} 	-	private static void ensure_main_loop_is_empty () {+	public static void ensure_main_loop_is_empty () { 		unowned MainContext context; 		bool acquired; @@ -367,12 +377,12 @@ public class MenuTab : FontDisplay { 	} 	 	public static void save_as ()  {-		MenuTab.save_callback = new SaveCallback ();+		MenuTab.set_save_callback (new SaveCallback ()); 		MenuTab.save_callback.save_as(); 	}  	public static void save ()  {-		MenuTab.save_callback = new SaveCallback ();+		MenuTab.set_save_callback (new SaveCallback ()); 		MenuTab.save_callback.save (); 	} 	diff --git a/libbirdfont/SaveCallback.vala b/libbirdfont/SaveCallback.valaindex 3496bd7..2d1db27 100644--- a/libbirdfont/SaveCallback.vala+++ b/libbirdfont/SaveCallback.vala@@ -17,8 +17,12 @@ namespace BirdFont { public class SaveCallback : GLib.Object { 	 	public signal void file_saved ();+	public bool is_done = false; 	 	public SaveCallback () {	+		file_saved.connect (() => {+			is_done = true;+		}); 	} 	 	public void save_as ()  {diff --git a/scripts/windows_build.py b/scripts/windows_build.pyindex 5c8c04a..5968c6e 100644--- a/scripts/windows_build.py+++ b/scripts/windows_build.py@@ -16,7 +16,7 @@ prefix = "" valac = "valac" valaflags = "" cc = "gcc"-cflags = "./build/icon.res -Wl,-subsystem,windows "+cflags = "-g ./build/icon.res -Wl,-subsystem,windows " ldflags = "" library_cflags = "-Wl,-subsystem,windows " library_ldflags= "";

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112