Fix birdfont-import command

Changed files (4)

• modified libbirdfont/GlyphCanvas.vala
• modified libbirdfont/Menu.vala
• modified libbirdfont/OverView.vala
• modified libbirdxml/XmlString.vala

Diff

diff --git a/libbirdfont/GlyphCanvas.vala b/libbirdfont/GlyphCanvas.valaindex 075f486..6923c6f 100644--- a/libbirdfont/GlyphCanvas.vala+++ b/libbirdfont/GlyphCanvas.vala@@ -54,17 +54,19 @@ public class GlyphCanvas : GLib.Object { 		BirdFont.current_glyph_collection = gc;
 		g.resized (allocation);
 		
-		if (signal_selected) {
-			current_display.selected_canvas ();
-			FontDisplay.dirty_scrollbar = true;
-		}
-		
-		current_display.redraw_area.connect ((x, y, w, h) => {
-			signal_redraw_area ((int)x, (int)y, (int)w, (int)h);
-		});
+		if (!is_null (current_display)) {
+			if (signal_selected) {
+				current_display.selected_canvas ();
+				FontDisplay.dirty_scrollbar = true;
+			}
+			
+			current_display.redraw_area.connect ((x, y, w, h) => {
+				signal_redraw_area ((int)x, (int)y, (int)w, (int)h);
+			});
 
-		redraw ();
-		
+			redraw ();
+		}
+		 
 		if (!is_null (MainWindow.native_window)) {
 			MainWindow.native_window.update_window_size ();
 		}
diff --git a/libbirdfont/Menu.vala b/libbirdfont/Menu.valaindex 270f3b2..9534ebf 100644--- a/libbirdfont/Menu.vala+++ b/libbirdfont/Menu.vala@@ -522,9 +522,7 @@ public class Menu : GLib.Object { 		} 		 		ma = menu_items.get (action);-		if (ma == null) {-			warning (@"No action for $action");-		} else {+		if (ma != null) { 			menu_action = (!) ma; 			menu_action.modifiers = modifier; 			menu_action.key = key;diff --git a/libbirdfont/OverView.vala b/libbirdfont/OverView.valaindex ca4650d..471505f 100644--- a/libbirdfont/OverView.vala+++ b/libbirdfont/OverView.vala@@ -851,7 +851,6 @@ public class OverView : FontDisplay { 		index = -1; 		 		if (items_per_row <= 0) {-			warning ("No items."); 			return; 		} diff --git a/libbirdxml/XmlString.vala b/libbirdxml/XmlString.valaindex a5ff014..3c86ddc 100644--- a/libbirdxml/XmlString.vala+++ b/libbirdxml/XmlString.vala@@ -98,7 +98,7 @@ public class XmlString {  	internal bool get_next_char (ref int index, out unichar c) { 		unowned string s;-		unowned string? n = data;+		unowned string? n = (string) data; 		 		if (n == null) { 			c = '\0';@@ -115,7 +115,7 @@ public class XmlString { 			return false; 		} 		-		s = (string) n;+		s = (!) n; 		 		return s.get_next_char (ref index, out c); 	}