Merge lp:~kamstrup/unity-lens-applications/include-gsettings-schema into lp:unity-lens-applications

[Mikkel Kamstrup Erlandsen]

See attached bug

[Michal Hruby (mhr3)]

Looks good, and it even works! :)

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-11-02 09:43:21 +0000
+++ configure.ac	2011-11-15 12:44:23 +0000
@@ -109,12 +109,19 @@
 AC_SUBST(DBUSSERVICEDIR)
 
 #############################################
+# GSettings macros
+#############################################
+
+GLIB_GSETTINGS
+
+#############################################
 # Create the Makefiles
 #############################################
 AC_CONFIG_FILES([
   Makefile
   applications.lens.in
   commands.lens.in
+  data/com.canonical.Unity.AppsLens.gschema.xml.in
   data/Makefile
   data/X-Unity-All-Applications.directory
   data/unity-lens-applications.menu

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-08-04 07:04:35 +0000
+++ data/Makefile.am	2011-11-15 12:44:23 +0000
@@ -1,3 +1,6 @@
+#############################################################
+# DBus service files
+#############################################################
 dbus_servicesdir = $(DBUSSERVICEDIR)
 service_in_files =  unity-lens-applications.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
@@ -5,6 +8,9 @@
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
+#############################################################
+# XDG Menu files
+#############################################################
 @INTLTOOL_DIRECTORY_RULE@
 
 directorydir = $(datadir)/desktop-directories
@@ -16,12 +22,23 @@
 menu_in_files = \
   unity-lens-applications.menu.in
 menu_DATA = $(menu_in_files:.menu.in=.menu)
-  
+
+#############################################################
+# GSettings schemas
+#############################################################
+gsettings_SCHEMAS = com.canonical.Unity.AppsLens.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
 
 EXTRA_DIST = \
+  com.canonical.Unity.AppsLens.gschema.xml.in.in \
   $(service_in_files) \
   $(directory_in_files) \
   $(menu_in_files)
 
 CLEANFILES = \
-  unity-lens-applications.service
+  unity-lens-applications.service \
+  $(gsettings_SCHEMAS)
+

=== added file 'data/com.canonical.Unity.AppsLens.gschema.xml.in.in'
--- data/com.canonical.Unity.AppsLens.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Unity.AppsLens.gschema.xml.in.in	2011-11-15 12:44:23 +0000
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema path="/desktop/unity/runner/" id="com.canonical.Unity.Runner" gettext-domain="unity-lens-applications">
+    <key type="as" name="history">
+        <default>[]</default>
+        <summary>History of Alt + F2 command</summary>
+        <description>Key for storing the history of the Alt + F2 command.  </description>
+    </key>
+  </schema>
+</schemalist>