Merge branch 'master' of gitorious.org:supplement/birdfont Conflicts: libbirdfont/ImportSvg.vala

Changed files (5)

• modified birdfont/GtkWindow.vala
• modified libbirdfont/Font.vala
• modified libbirdfont/ImportSvg.vala
• modified libbirdfont/Toolbox.vala
• modified mac/build_mac.py

Diff

diff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex 238a70b..0beae8c 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -857,7 +857,9 @@ public class GlyphCanvasArea : DrawingArea  { 	}  	static void set_modifier (int k) {-		if (has_flag (k, ModifierType.MOD5_MASK)) {+		// MOD5 is logo button on Linux+		// MOD2 is logo button on Mac OS X+		if (has_flag (k, ModifierType.MOD5_MASK | ModifierType.MOD2_MASK)) { 			KeyBindings.set_modifier (LOGO); 		} else if (has_flag (k, ModifierType.SHIFT_MASK)) { 			KeyBindings.set_modifier (SHIFT);diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex 62e85ec..6a82c6f 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -903,7 +903,7 @@ public class Font : GLib.Object { 				parse_background_selection (iter); 			} -			if (iter->name == "name") {+			if (iter->name == "name" && iter->children != null) { 				name = iter->children->content; 			} @@ -942,7 +942,8 @@ public class Font : GLib.Object { 		node = root; 		 		for (Xml.Node* iter = node->children; iter != null; iter = iter->next) {-			if (iter->name == "name") {+			+			if (iter->name == "name" && iter->children != null) { 				name = iter->children->content; 			} 			diff --git a/libbirdfont/ImportSvg.vala b/libbirdfont/ImportSvg.valaindex 88b43d2..a20f9e3 100644--- a/libbirdfont/ImportSvg.vala+++ b/libbirdfont/ImportSvg.vala@@ -37,7 +37,7 @@ public class ImportSvg { 		 		// FIXME: libxml2 (2.7.8) refuses to parse svg files created with Adobe Illustrator on  		// windows. This is a way around it.-		if (Supplement.win32) {+		if (Supplement.win32 || true) { 			File f = File.new_for_path (path); 			DataInputStream dis = new DataInputStream (f.read ()); 			string xml_data;@@ -65,12 +65,13 @@ public class ImportSvg { 			root = doc->get_root_element (); 					 			if (root == null) {+				warning ("Failed to load SVG file"); 				delete doc; 				return; 			}  			parse_svg_file (root);-					+ 			delete doc; 			Parser.cleanup (); 		}diff --git a/libbirdfont/Toolbox.vala b/libbirdfont/Toolbox.valaindex 8e51038..5049370 100644--- a/libbirdfont/Toolbox.vala+++ b/libbirdfont/Toolbox.vala@@ -242,8 +242,8 @@ public class Toolbox : GLib.Object  { 			 		} 		-		// help lines, grid and other guidlines-		Tool help_lines = new Tool ("help_lines", "Show help lines", 'l');+		// guide lines, grid and other guidlines+		Tool help_lines = new Tool ("help_lines", "Show guidelines", 'l'); 		help_lines.select_action.connect ((self) => { 				bool h; 				h = GlyphCanvas.get_current_glyph ().get_show_help_lines ();@@ -254,7 +254,7 @@ public class Toolbox : GLib.Object  {  		guideline_tools.add_tool (help_lines); -		Tool xheight_help_lines = new Tool ("show_xheight_helplines", _("Show help lines for x-height and baseline"), 'x');+		Tool xheight_help_lines = new Tool ("show_xheight_helplines", _("Show guidelines for x-height and baseline"), 'x'); 		xheight_help_lines.select_action.connect ((self) => { 			Glyph g = MainWindow.get_current_glyph (); 			bool v = !g.get_xheight_lines_visible ();@@ -269,7 +269,7 @@ public class Toolbox : GLib.Object  { 		}); 		guideline_tools.add_tool (xheight_help_lines); -		Tool background_help_lines = new Tool ("background_help_lines", _("Show help lines at top and bottom margin"), 't');+		Tool background_help_lines = new Tool ("background_help_lines", _("Show guidelines at top and bottom margin"), 't'); 		background_help_lines.select_action.connect ((self) => { 			Glyph g = MainWindow.get_current_glyph (); 			bool v = !g.get_margin_lines_visible ();diff --git a/mac/build_mac.py b/mac/build_mac.pyindex c2877df..df34c97 100755--- a/mac/build_mac.py+++ b/mac/build_mac.py@@ -51,7 +51,7 @@ def build(): 	run("mkdir -p build/mac/libbirdfont") 	run("mkdir -p build/mac/bin") -	run("valac -C --define=MAC --library libbirdfont -H birdfont.h libbirdfont/* --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0")+	run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC --library libbirdfont -H birdfont.h libbirdfont/* --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0") 	run("mv libbirdfont/*.c build/mac/libbirdfont/ ") 	run("mv ./*.h build/mac/libbirdfont/") @@ -64,10 +64,10 @@ def build(): 	# birdfont 	run("mkdir -p build/mac/birdfont") 	-	run("valac -C --define=MAC birdfont/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")+	run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont") 	run("mv birdfont/*.c build/mac/birdfont/") -	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/libbirdfont/""")+	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/mac/libbirdfont/""") 	run("mv ./*.o build/mac/birdfont/")  	run("gcc build/mac/birdfont/*.o ./build/mac/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/mac/bin/birdfont")@@ -75,10 +75,10 @@ def build(): 	# birdfont-export 	run("mkdir -p build/mac/birdfont-export") 	-	run("valac -C --define=MAC birdfont-export/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont")+	run("valac -C --enable-experimental-non-null --enable-experimental --define=MAC birdfont-export/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont") 	run("mv birdfont-export/*.c build/mac/birdfont-export/") -	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont-export/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/libbirdfont/""")+	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont-export/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags libxml-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --cflags cairo) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk-pixbuf-2.0) $(pkg-config --cflags webkit-1.0) -I ./build/mac/libbirdfont/""") 	run("mv ./*.o build/mac/birdfont-export/")  	run("gcc build/mac/birdfont-export/*.o ./build/mac/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/mac/bin/birdfont-export")