From: Johan Mattsson <johan.mattsson.m@gmail.com>
Date: Wed, 13 May 2015 18:30:46 +0000
Subject: Fixes for Mac OS X
X-Git-Url: https://birdfont.org/gitphp-glip/index.php?p=birdfont.git&a=commitdiff&h=8774237a22c32a1dbe6df3accc5146dbc199de19
---
Fixes for Mac OS X

---


--- a/libbirdfont/BirdFont.vala
+++ b/libbirdfont/BirdFont.vala
@@ -366,7 +366,7 @@
  	public static bool mac = false;
  	public static bool android = false;
  	public static string exec_path = "";
- 	public static string bundle_path = "";
+ 	public static string? bundle_path = null;
  
  	public static bool logging = false;
  	public static DataOutputStream? logstream = null;

--- a/libbirdfont/SearchPaths.vala
+++ b/libbirdfont/SearchPaths.vala
@@ -177,6 +177,11 @@
  		}
  
  		f = (!) File.new_for_path (BirdFont.exec_path + "/Contents/Resources/NamesList.txt");
+ 		if (f.query_exists ()) {
+ 			return f;
+ 		}
+ 
+ 		f = (!) File.new_for_path (BirdFont.bundle_path + "/Contents/Resources/NamesList.txt");
  		if (f.query_exists ()) {
  			return f;
  		}