From: Alan Knowles <alan@roojs.com>
Date: Wed, 20 May 2015 08:57:35 +0000 (+0800)
Subject: src/Builder4/ClutterFiles.bjs
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=cf46a76df0c204881f38cf6f19cb80f2377d7303;p=app.Builder.js

src/Builder4/ClutterFiles.bjs
src/Builder4/ClutterFiles.vala
---

diff --git a/src/Builder4/ClutterFiles.bjs b/src/Builder4/ClutterFiles.bjs
index f23ab3a79..2619f96d2 100644
--- a/src/Builder4/ClutterFiles.bjs
+++ b/src/Builder4/ClutterFiles.bjs
@@ -69,7 +69,7 @@
          "$ margin_top" : 5,
          "id" : "+image",
          "* args" : "JsRender.JsRender file",
-         "* init" : "{\n    Gdk.Pixbuf pixbuf= null;\n    \n    var fname = file.getIconFileName(false);\n\n    try {\n        if (FileUtils.test(fname, FileTest.EXISTS)) {\n            pixbuf = new Gdk.Pixbuf.from_file(fname);\n        } \n        catch (Error e) {\n        \n        }\n    }\n    if (pixbuf == null) {\n    \n        if (_this.missing_thumb_pixbuf == null) {\n                var     icon_theme = Gtk.IconTheme.get_default ();\n                _this.missing_thumb_pixbuf = icon_theme.load_icon (\"package-x-generic\", 92, 0);\n                _this.missing_thumb_pixbuf.ref();\n            }\n            pixbuf = _this.missing_thumb_pixbuf;\n\n    }\n\n    var img = new Clutter.Image();\n    img.set_data(pixbuf.get_pixels(),   \n                        pixbuf.has_alpha \n                          ? Cogl.PixelFormat.RGBA_8888\n                          : Cogl.PixelFormat.RGB_888,\n                        pixbuf.get_width (),\n            pixbuf.get_height (),\n                        pixbuf.get_rowstride ()\n    );\n    this.el.set_content(img);\n     // should probably do smarter scaling...\n    \n    \n    this.el.set_size(90, 70);\n}\n",
+         "* init" : "{\n    Gdk.Pixbuf pixbuf= null;\n    \n    var fname = file.getIconFileName(false);\n\n    try {\n        if (FileUtils.test(fname, FileTest.EXISTS)) {\n            pixbuf = new Gdk.Pixbuf.from_file(fname);\n        } \n    } catch (Error e) {\n        // noop\n    \n    }\n    if (pixbuf == null) {\n    \n        if (_this.missing_thumb_pixbuf == null) {\n                var     icon_theme = Gtk.IconTheme.get_default ();\n                _this.missing_thumb_pixbuf = icon_theme.load_icon (\"package-x-generic\", 92, 0);\n                _this.missing_thumb_pixbuf.ref();\n            }\n            pixbuf = _this.missing_thumb_pixbuf;\n\n    }\n\n    var img = new Clutter.Image();\n    img.set_data(pixbuf.get_pixels(),   \n                        pixbuf.has_alpha \n                          ? Cogl.PixelFormat.RGBA_8888\n                          : Cogl.PixelFormat.RGB_888,\n                        pixbuf.get_width (),\n            pixbuf.get_height (),\n                        pixbuf.get_rowstride ()\n    );\n    this.el.set_content(img);\n     // should probably do smarter scaling...\n    \n    \n    this.el.set_size(90, 70);\n}\n",
          "$ x_expand" : true,
          "* pack" : "add_child",
          "xtype" : "Actor",
diff --git a/src/Builder4/ClutterFiles.vala b/src/Builder4/ClutterFiles.vala
index 52e8bfb5a..a43595e5b 100644
--- a/src/Builder4/ClutterFiles.vala
+++ b/src/Builder4/ClutterFiles.vala
@@ -305,9 +305,9 @@ public class Xcls_ClutterFiles : Object
                     if (FileUtils.test(fname, FileTest.EXISTS)) {
                         pixbuf = new Gdk.Pixbuf.from_file(fname);
                     } 
-                    catch (Error e) {
-                    
-                    }
+                } catch (Error e) {
+                    // noop
+                
                 }
                 if (pixbuf == null) {