[glabels/vala] Install schemas.

[Jim Evins <jimevins src gnome org>]

commit de7435752785937dc768eb52ef19825b571fb0b5
Author: Jim Evins <evins snaught com>
Date:   Sat Aug 11 23:43:04 2012 -0400

    Install schemas.

 configure.ac                                       |    4 ++++
 data/Makefile.am                                   |    4 ++--
 data/schemas/Makefile.am                           |    2 +-
 ...in.in => org.gnome.glabels-4.gschema.xml.in.in} |   18 +++++++++---------
 glabels/color_history.vala                         |    2 +-
 glabels/font_history.vala                          |    2 +-
 glabels/prefs.vala                                 |    6 +++---
 glabels/template_history.vala                      |    2 +-
 8 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d531454..629f957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,8 @@ AC_PROG_LIBTOOL
 
 GNOME_DOC_INIT
 
+GLIB_GSETTINGS
+
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE,      gdk-pixbuf-csource)
 AC_PATH_PROG(GTK_UPDATE_ICON_CACHE,   gtk-update-icon-cache)
 
@@ -113,6 +115,8 @@ AC_CONFIG_FILES([Makefile
         data/icons/32x32/Makefile
         data/icons/48x48/Makefile
         data/pixmaps/Makefile
+        data/schemas/Makefile
+        data/schemas/org.gnome.glabels-4.gschema.xml.in
         data/ui/Makefile
         help/Makefile])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 2eb6b7c..4d2d675 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,11 +3,11 @@
 SUBDIRS = \
 	icons \
 	pixmaps \
+	schemas \
 	ui
 
 #	desktop \
 #	man \
-#	mime \
-#	schemas
+#	mime
 
 
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index b971934..fe0416e 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -1,6 +1,6 @@
 
 gsettings_files = \
-	org.gnome.glabels-3.gschema.xml.in
+	org.gnome.glabels-4.gschema.xml.in
 
 gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
 
diff --git a/data/schemas/org.gnome.glabels-3.gschema.xml.in.in b/data/schemas/org.gnome.glabels-4.gschema.xml.in.in
similarity index 90%
rename from data/schemas/org.gnome.glabels-3.gschema.xml.in.in
rename to data/schemas/org.gnome.glabels-4.gschema.xml.in.in
index c7e7ea9..9afaf06 100644
--- a/data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+++ b/data/schemas/org.gnome.glabels-4.gschema.xml.in.in
@@ -1,15 +1,15 @@
 <schemalist>
 
 
-  <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@">
-    <child name="ui" schema="org.gnome.glabels.ui"/>
-    <child name="locale" schema="org.gnome.glabels.locale"/>
-    <child name="objects" schema="org.gnome.glabels.objects"/>
-    <child name="history" schema="org.gnome.glabels.history"/>
+  <schema id="org.gnome.glabels-4" path="/apps/glabels-4/" gettext-domain="@GETTEXT_PACKAGE@">
+    <child name="ui" schema="org.gnome.glabels-4.ui"/>
+    <child name="locale" schema="org.gnome.glabels-4.locale"/>
+    <child name="objects" schema="org.gnome.glabels-4.objects"/>
+    <child name="history" schema="org.gnome.glabels-4.history"/>
   </schema>
 
 
-  <schema id="org.gnome.glabels-3.ui" path="/apps/glabels-3/ui/" gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.glabels-4.ui" path="/apps/glabels-4/ui/" gettext-domain="@GETTEXT_PACKAGE@">
 
     <key name="main-toolbar-visible" type="b">
       <default>true</default>
@@ -50,7 +50,7 @@
   </schema>
 
 
-  <schema id="org.gnome.glabels-3.locale" path="/apps/glabels-3/locale/" gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.glabels-4.locale" path="/apps/glabels-4/locale/" gettext-domain="@GETTEXT_PACKAGE@">
 
     <key name="units" type="s">
       <choices>
@@ -78,7 +78,7 @@
   </schema>
 
 
-  <schema id="org.gnome.glabels-3.objects" path="/apps/glabels-3/objects/" gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.glabels-4.objects" path="/apps/glabels-4/objects/" gettext-domain="@GETTEXT_PACKAGE@">
     <key name="default-font-family" type="s">
       <default>'Sans'</default>
       <_summary>Default font family.</_summary>
@@ -154,7 +154,7 @@
   </schema>
 
 
-  <schema id="org.gnome.glabels-3.history" path="/apps/glabels-3/history/" gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.glabels-4.history" path="/apps/glabels-4/history/" gettext-domain="@GETTEXT_PACKAGE@">
 
     <key name="recent-templates" type="as">
       <default>[]</default>
diff --git a/glabels/color_history.vala b/glabels/color_history.vala
index 097ccb8..d9437f7 100644
--- a/glabels/color_history.vala
+++ b/glabels/color_history.vala
@@ -34,7 +34,7 @@ namespace glabels
 
 		static construct
 		{
-			history = new GLib.Settings( "org.gnome.glabels-3.history" );
+			history = new GLib.Settings( "org.gnome.glabels-4.history" );
 		}
 
 		public ColorHistory( int n )
diff --git a/glabels/font_history.vala b/glabels/font_history.vala
index 0afa47c..f7fe206 100644
--- a/glabels/font_history.vala
+++ b/glabels/font_history.vala
@@ -36,7 +36,7 @@ namespace glabels
 
 		static construct
 		{
-			history = new GLib.Settings( "org.gnome.glabels-3.history" );
+			history = new GLib.Settings( "org.gnome.glabels-4.history" );
 		}
 
 		public FontHistory( int n )
diff --git a/glabels/prefs.vala b/glabels/prefs.vala
index eaa3f63..7c8f647 100644
--- a/glabels/prefs.vala
+++ b/glabels/prefs.vala
@@ -44,9 +44,9 @@ namespace glabels
 
 		static construct
 		{
-			locale  = new GLib.Settings( "org.gnome.glabels-3.locale" );
-			objects = new GLib.Settings( "org.gnome.glabels-3.objects" );
-			ui      = new GLib.Settings( "org.gnome.glabels-3.ui" );
+			locale  = new GLib.Settings( "org.gnome.glabels-4.locale" );
+			objects = new GLib.Settings( "org.gnome.glabels-4.objects" );
+			ui      = new GLib.Settings( "org.gnome.glabels-4.ui" );
 		}
 
 		public Prefs()
diff --git a/glabels/template_history.vala b/glabels/template_history.vala
index c609a80..650ea53 100644
--- a/glabels/template_history.vala
+++ b/glabels/template_history.vala
@@ -34,7 +34,7 @@ namespace glabels
 
 		static construct
 		{
-			history = new GLib.Settings( "org.gnome.glabels-3.history" );
+			history = new GLib.Settings( "org.gnome.glabels-4.history" );
 		}
 
 		public TemplateHistory( int n )