Merge branch 'master' of gitorious.org:birdfont/birdfont

Changed files (5)

• modified libbirdfont/Argument.vala
• modified libbirdfont/BirdFont.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/SearchPaths.vala
• modified libbirdfont/TabBar.vala

Diff

diff --git a/libbirdfont/Argument.vala b/libbirdfont/Argument.valaindex b642624..7ce9b1b 100644--- a/libbirdfont/Argument.vala+++ b/libbirdfont/Argument.vala@@ -63,7 +63,8 @@ public class Argument : GLib.Object { 				a == "--test" ||  				a == "--fatal-warning" ||  				a == "--show-coordinates" || -				a == "--mac") {+				a == "--mac" ||+				a == "--donated") { 				prev = a; 				i++; 				continue;diff --git a/libbirdfont/BirdFont.vala b/libbirdfont/BirdFont.valaindex f68ef7f..d9abb06 100644--- a/libbirdfont/BirdFont.vala+++ b/libbirdfont/BirdFont.vala@@ -181,6 +181,7 @@ public class BirdFont { 	public static bool win32 = false; 	public static bool mac = false; 	public static string exec_path = "";+	public static string bundle_path = "";  	public static Font current_font; 	public static Glyph current_glyph;@@ -271,6 +272,10 @@ public class BirdFont {  	} +	public static void set_bundle_path (string path) {+		bundle_path = path;	+	}+ 	static void init_gettext () { 		string locale_directory = SearchPaths.get_locale_directory (); 		Intl.setlocale (LocaleCategory.MESSAGES, "");diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex 5953487..0304124 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -343,9 +343,10 @@ public class PenTool : Tool { 				if (!((!)active_edit_point).is_selected ()) { 					remove_all_selected_points (); 					((!)active_edit_point).set_selected (true);-					selected_point = (!)active_edit_point; 					add_selected_point (selected_point); 				}+				+				selected_point = (!)active_edit_point; 			} 		} 		diff --git a/libbirdfont/SearchPaths.vala b/libbirdfont/SearchPaths.valaindex 98d7a8d..9b910b5 100644--- a/libbirdfont/SearchPaths.vala+++ b/libbirdfont/SearchPaths.vala@@ -33,10 +33,10 @@ public class SearchPaths { 		f = get_file (BirdFont.exec_path + "\\", name + "\\"); 		if (likely (f.query_exists ())) return f; 		-		f = get_file (BirdFont.exec_path + "/Contents/Resources/", d + "/" + name);+		f = get_file (BirdFont.bundle_path + "/Contents/Resources/", d + "/" + name); 		if (likely (f.query_exists ())) return f;--		f = get_file (BirdFont.exec_path + "/Contents/Resources/", name + "/");+		+		f = get_file (BirdFont.bundle_path + "/Contents/Resources/", name + "/"); 		if (likely (f.query_exists ())) return f; 		 		f = get_file ("./" + d + "/", name);diff --git a/libbirdfont/TabBar.vala b/libbirdfont/TabBar.valaindex 094ff52..47c0abd 100644--- a/libbirdfont/TabBar.vala+++ b/libbirdfont/TabBar.vala@@ -504,6 +504,15 @@ public class TabBar : GLib.Object { 		double offset = 19; 		int i = 0; 		+		return_if_fail (tab3_right != null);+		return_if_fail (tab2_right != null);+		return_if_fail (tab1_right != null);+		return_if_fail (tab3_left != null);+		return_if_fail (tab3_right != null);+		return_if_fail (tab2_left != null);+		return_if_fail (tab1_left != null);+		return_if_fail (tab1_right != null);+		 		foreach (Tab t in tabs) { 			 			if (i < first_tab) {