Imported Upstream version 0.3.1

1 files changed, 7 insertions, 7 deletions

diff --git a/src/themes/theme.vala b/src/themes/theme.vala
index fa6f55a..284e1ef 100644
--- a/src/themes/theme.vala
+++ b/src/themes/theme.vala
@@ -71,8 +71,6 @@ public class Theme : GLib.Object {
         this.inactive_slice_layers = new Gee.ArrayList<SliceLayer?>();
         
         this.directory = dir;
-        
-        this.load();
     }
     
     /////////////////////////////////////////////////////////////////////
@@ -80,7 +78,7 @@ public class Theme : GLib.Object {
     /// explicitly.
     /////////////////////////////////////////////////////////////////////
     
-    public void load() {
+    public bool load() {
         this.center_layers.clear();
         this.active_slice_layers.clear();
         this.inactive_slice_layers.clear();
@@ -90,15 +88,15 @@ public class Theme : GLib.Object {
         
         Xml.Doc* themeXML = Xml.Parser.parse_file(path);
         if (themeXML == null) {
-            warning("Error parsing theme: \"" + path + "\" not found!");
-            return;
+            warning("Failed to add theme: \"" + path + "\" not found!");
+            return false;
         }
 
         Xml.Node* root = themeXML->get_root_element();
         if (root == null) {
             delete themeXML;
-            warning("Invalid theme \"" + this.directory + "\": theme.xml is empty!");
-            return;
+            warning("Failed to add theme: \"theme.xml\" is empty!");
+            return false;
         }
         
         this.parse_root(root);
@@ -107,6 +105,8 @@ public class Theme : GLib.Object {
         Xml.Parser.cleanup();
         
         this.radius *= max_zoom;
+        
+        return true;
     }
     
     /////////////////////////////////////////////////////////////////////