[cheese] Move ClutterScript JSON into GResource

[David King <davidk src gnome org>]

commit 73f2ef0b6d0852fda67256e708652ec4320f2119
Author: David King <amigadave amigadave com>
Date:   Mon Nov 11 22:00:11 2013 +0000

    Move ClutterScript JSON into GResource

 Makefile.am               |    6 +++---
 data/cheese.gresource.xml |    1 +
 src/cheese-window.vala    |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cf3aaac..1efc45a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -195,7 +195,8 @@ typelib_DATA = Cheese-3.0.typelib
 endif
 
 noinst_resource_files = \
-       data/cheese.css
+       data/cheese.css \
+       data/cheese-viewport.json
 
 src/cheese-resource.c src/cheese-resource.h: data/cheese.gresource.xml Makefile $(noinst_resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate --c-name 
cheese $<
@@ -311,8 +312,7 @@ gsettings_SCHEMAS = data/org.gnome.Cheese.gschema.xml
 
 dist_pkgdata_DATA = \
        data/cheese-main-window.ui \
-       data/cheese-prefs.ui \
-       data/cheese-viewport.json
+       data/cheese-prefs.ui
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
diff --git a/data/cheese.gresource.xml b/data/cheese.gresource.xml
index d316bdd..e171e08 100644
--- a/data/cheese.gresource.xml
+++ b/data/cheese.gresource.xml
@@ -2,6 +2,7 @@
 <gresources>
   <gresource prefix='/org/gnome/Cheese'>
     <file>cheese.css</file>
+    <file>cheese-viewport.json</file>
   </gresource>
 </gresources>
 
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index e5cfb93..0577297 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);