[california/wip/730603-gsettings] Final touches

[Jim Nelson <jnelson src gnome org>]

commit 5af89d90e1c554230c1aee71500b1cd272dacb89
Author: Jim Nelson <jim yorba org>
Date:   Thu May 29 17:56:15 2014 -0700

    Final touches

 configure.ac                                |    2 ++
 data/Makefile.am                            |    1 +
 src/application/california-application.vala |    4 ----
 src/application/california-settings.vala    |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a15354..8cdcbe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,8 @@ PKG_CHECK_MODULES(CALIFORNIA, [
 AC_SUBST(CALIFORNIA_CFLAGS)
 AC_SUBST(CALIFORNIA_LIBS)
 
+GLIB_GSETTINGS
+
 #
 # configure switches
 #
diff --git a/data/Makefile.am b/data/Makefile.am
index 87e7364..5fa5269 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,6 +6,7 @@ data_appdatadir = $(datadir)/appdata
 data_appdata_DATA = data/california.appdata.xml
 
 gsettings_SCHEMAS = data/org.yorba.california.gschema.xml
+ GSETTINGS_RULES@
 
 # Local build of California's GSettings schema to allow executing from build dir
 data/gschemas.compiled: data/org.yorba.california.gschema.xml
diff --git a/src/application/california-application.vala b/src/application/california-application.vala
index a9fb17e..711c3e0 100644
--- a/src/application/california-application.vala
+++ b/src/application/california-application.vala
@@ -116,10 +116,6 @@ public class Application : Gtk.Application {
         if (!Commandline.parse(args, out exit_status))
             return true;
         
-        debug("exec_file=%s exec_dir=%s prefix_dir=%s is_installed=%s build_root_dir=%s",
-            exec_file.get_path(), exec_dir.get_path(), prefix_dir.get_path(), is_installed.to_string(),
-            build_root_dir.get_path());
-        
         try {
             register();
         } catch (Error err) {
diff --git a/src/application/california-settings.vala b/src/application/california-settings.vala
index 97e3e3a..226c03e 100644
--- a/src/application/california-settings.vala
+++ b/src/application/california-settings.vala
@@ -39,7 +39,7 @@ public class Settings : BaseObject {
         // this needs to be available before initialization
         assert(Application.instance.exec_file != null);
         
-        // if not installed, point GSettings to our copy in the build directory
+        // if not running installed executable, point GSettings to our copy in the build directory
         if (!Application.instance.is_installed) {
             File schema_dir = Application.instance.build_root_dir.get_child("data");
             Environment.set_variable("GSETTINGS_SCHEMA_DIR", schema_dir.get_path(), true);