Merge lp:~dobey/ubuntuone-client-gnome/evil-gsettings-2-0 into lp:ubuntuone-client-gnome/stable-2-0

[dobey]

Add a gschema for nautilus extension
Add the additional state key we use in g-s-d to the schema

This was already approved and landed in trunk. This is a backport to stable-2-0 for releasing to Oneiric.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'gsd/gsd-ubuntuone.gschema.xml.in.in'
--- gsd/gsd-ubuntuone.gschema.xml.in.in	2011-09-22 19:06:20 +0000
+++ gsd/gsd-ubuntuone.gschema.xml.in.in	2011-10-04 17:17:23 +0000
@@ -10,5 +10,10 @@
       <summary>Priority for loading Ubuntu One features in gnome-settings-daemon</summary>
       <description>The startup queue priority for the Ubuntu One gnome-settings-daemon plug-in.</description>
     </key>
+    <key name="checked-bookmark-file" type="b">
+      <default>false</default>
+      <summary>Whether the bookmarks file configuration has been done yet.</summary>
+      <description>True if the bookmarks file has been configured with the Ubuntu One bookmark already.</description>
+    </key>
   </schema>
 </schemalist>

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2011-07-20 20:44:39 +0000
+++ nautilus/Makefile.am	2011-10-04 17:17:23 +0000
@@ -4,6 +4,20 @@
 
 extension_LTLIBRARIES = libnautilus-ubuntuone.la
 
+gschema_in_files = nautilus-ubuntuone.gschema.xml.in.in
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
+
+if HAVE_NAUTILUS_30
+gsettingsdir = $(datadir)/glib-2.0/schemas
+
+%.gschema.xml.in: %.gschema.xml.in.in
+	$(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+endif
+
 libnautilus_ubuntuone_la_CFLAGS =			\
 	-DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\"		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
@@ -70,7 +84,8 @@
 	test-highlight.c
 test_highlight_LDADD = $(NAUTILUS_LIBS)
 
-EXTRA_DIST =		\
+EXTRA_DIST = \
+	$(gschema_in_files) \
 	ubuntuone-marshallers.list
 
 MAINTAINERCLEANFILES =	\

=== added file 'nautilus/nautilus-ubuntuone.gschema.xml.in.in'
--- nautilus/nautilus-ubuntuone.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ nautilus/nautilus-ubuntuone.gschema.xml.in.in	2011-10-04 17:17:23 +0000
@@ -0,0 +1,19 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.nautilus.extensions.ubuntuone" path="/org/gnome/nautilus/extensions/ubuntuone/">
+    <key name="recently-used-contacts" type="as">
+      <default>[]</default>
+      <summary>Recently used contacts</summary>
+      <description>Contacts which have been used recently in the Ubuntu One share dialog.</description>
+    </key>
+    <key name="expand-location" type="b">
+      <default>false</default>
+      <summary>Whether the location bar is expanded</summary>
+      <description>True if the location bar is expanded.</description>
+    </key>
+    <key name="show-location" type="b">
+      <default>false</default>
+      <summary>Hide the location bar.</summary>
+      <description>True if the Ubuntu One location bar is to be hidden.</description>
+    </key>
+  </schema>
+</schemalist>