Fix #8019 - tidy up resource usage

[roobuilder] / src / Palete / Roo.vala

diff --git a/src/Palete/Roo.vala b/src/Palete/Roo.vala
index 853b8e0..5492884 100644 (file)
--- a/src/Palete/Roo.vala
+++ b/src/Palete/Roo.vala
@@ -88,15 +88,24 @@ namespace Palete {
                        }
                        
                        
-                       // this.loadUsageFile(BuilderApplication.configDirectory() + "/resources/RooUsage.txt");
+ 
                        this.classes = new Gee.HashMap<string,GirObject>();
                        var add_to =  new Gee.HashMap<string,Gee.ArrayList<string>>();
-                               
+                       
+                       var f = GLib. File.new_for_path(BuilderApplication.configDirectory() + "/resources/roodata.json");
+                       if (!f.query_exists(null)) {
+                               f = GLib. File.new_for_uri("resources:///html/roodata.json");   
+                       }                       
+
+                       
+                       
                        var pa = new Json.Parser();
                        try { 
-                               pa.load_from_file(BuilderApplication.configDirectory() + "/resources/roodata.json");
+                               uint8[] data;
+                               f.load_contents( null, out data, null );
+                               pa.load_from_data((string) data);
                        } catch(GLib.Error e) {
-                               GLib.error("Could not load %s",BuilderApplication.configDirectory() + "/resources/roodata.json");
+                               GLib.error("Could not load %s",f.get_uri());
                        }
                        var node = pa.get_root();