summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid King <amigadave@amigadave.com>2013-11-11 22:00:11 +0000
committerDavid King <amigadave@amigadave.com>2013-11-11 22:00:11 +0000
commit73f2ef0b6d0852fda67256e708652ec4320f2119 (patch)
tree18744d4c5989fee9dd5208b50ed4cc2b565647af /src
parent2fcb2988a0bf53b3c3a43ad000c6c0a98c79459c (diff)
downloadcheese-73f2ef0b6d0852fda67256e708652ec4320f2119.tar.gz
Move ClutterScript JSON into GResource
Diffstat (limited to 'src')
-rw-r--r--src/cheese-window.vala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index e5cfb93e..05772970 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -1136,7 +1136,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
public void setup_ui ()
{
gtk_builder = new Gtk.Builder ();
- clutter_builder = new Clutter.Script ();
+ clutter_builder = new Clutter.Script ();
fileutil = new FileUtil ();
flash = new Flash (this);
settings = new GLib.Settings ("org.gnome.Cheese");
@@ -1164,7 +1164,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
gtk_builder.add_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-main-window.ui"));
gtk_builder.connect_signals (this);
- clutter_builder.load_from_file (GLib.Path.build_filename (Config.PACKAGE_DATADIR, "cheese-viewport.json"));
+ clutter_builder.load_from_resource ("/org/gnome/Cheese/cheese-viewport.json");
} catch (Error err)
{
error ("Error: %s", err.message);