Merge lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/release-200 into lp:ubuntu/oneiric/ubuntuone-client-gnome

[dobey]

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-11 12:52:11 +0000
+++ Makefile.am	2011-09-27 18:40:29 +0000
@@ -3,6 +3,13 @@
 # Shut libtoolize up
 ACLOCAL_AMFLAGS = -I m4
 
+# GConf->GSettings data migration
+convert_DATA = ubuntuone-client-gnome.convert
+convertdir = $(datadir)/GConf/gsettings
+
+EXTRA_DIST = \
+	$(convert_DATA)
+
 MAINTAINERCLEANFILES =	\
 	Makefile.in	\
 	aclocal.m4	\

=== modified file 'Makefile.in'
--- Makefile.in	2011-08-11 12:52:11 +0000
+++ Makefile.in	2011-09-27 18:40:29 +0000
@@ -14,6 +14,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -66,6 +67,29 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(convertdir)"
+DATA = $(convert_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -143,11 +167,13 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSD_INTLTOOL_PLUGIN_RULE = @GSD_INTLTOOL_PLUGIN_RULE@
 GSD_PLUGINDIR_NAME = @GSD_PLUGINDIR_NAME@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -222,6 +248,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -252,6 +279,13 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = gsd nautilus po
+
+# GConf->GSettings data migration
+convert_DATA = ubuntuone-client-gnome.convert
+convertdir = $(datadir)/GConf/gsettings
+EXTRA_DIST = \
+	$(convert_DATA)
+
 MAINTAINERCLEANFILES = \
 	Makefile.in	\
 	aclocal.m4	\
@@ -330,6 +364,26 @@
 
 distclean-libtool:
 	-rm -f libtool config.lt
+install-convertDATA: $(convert_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
+	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
+	done
+
+uninstall-convertDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(convertdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -643,9 +697,12 @@
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(convertdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -694,7 +751,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-convertDATA
 
 install-dvi: install-dvi-recursive
 
@@ -740,7 +797,7 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-convertDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	ctags-recursive install-am install-strip tags-recursive
@@ -752,14 +809,15 @@
 	distcheck distclean distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am
+	install install-am install-convertDATA install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-convertDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-08-11 12:52:11 +0000
+++ aclocal.m4	2011-09-27 18:40:29 +0000
@@ -19,6 +19,90 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AC_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
 # nls.m4 serial 5 (gettext-0.18)
 dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
 dnl Inc.

=== modified file 'config.h.in'
--- config.h.in	2011-08-11 12:52:11 +0000
+++ config.h.in	2011-09-27 18:40:29 +0000
@@ -18,6 +18,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* If using nautilus 3.0 or newer */
+#undef HAVE_NAUTILUS_30
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 

=== modified file 'configure'
--- configure	2011-08-11 12:52:11 +0000
+++ configure	2011-09-27 18:40:29 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ubuntuone-client-gnome 1.7.1.
+# Generated by GNU Autoconf 2.67 for ubuntuone-client-gnome 2.0.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='ubuntuone-client-gnome'
 PACKAGE_TARNAME='ubuntuone-client-gnome'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='ubuntuone-client-gnome 1.7.1'
+PACKAGE_VERSION='2.0.0'
+PACKAGE_STRING='ubuntuone-client-gnome 2.0.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -748,6 +748,8 @@
 GSD_PLUGINDIR_NAME
 SETTINGS_PLUGIN_LIBS
 SETTINGS_PLUGIN_CFLAGS
+HAVE_GSD_30_FALSE
+HAVE_GSD_30_TRUE
 GLIB_GENMARSHAL
 DISTCHECK_CONFIGURE_FLAGS
 DBUS_LIBS
@@ -755,6 +757,12 @@
 NAUTILUS_EXTENSIONDIR_NAME
 NAUTILUS_LIBS
 NAUTILUS_CFLAGS
+HAVE_NAUTILUS_30_FALSE
+HAVE_NAUTILUS_30_TRUE
+GSETTINGS_RULES
+GLIB_COMPILE_SCHEMAS
+gsettingsschemadir
+GSETTINGS_DISABLE_SCHEMAS_COMPILE
 ACLOCAL_AMFLAGS
 GETTEXT_PACKAGE
 DATADIRNAME
@@ -910,6 +918,7 @@
 enable_libtool_lock
 enable_nls
 enable_debug
+enable_schemas_compile
 enable_grid_view
 '
       ac_precious_vars='build_alias
@@ -1472,7 +1481,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ubuntuone-client-gnome 1.7.1 to adapt to many kinds of systems.
+\`configure' configures ubuntuone-client-gnome 2.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1543,7 +1552,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ubuntuone-client-gnome 1.7.1:";;
+     short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1562,6 +1571,8 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-nls           do not use Native Language Support
   --enable-debug          Enable debug logging by default [default=auto]
+  --disable-schemas-compile
+                          Disable regeneration of gschemas.compiled on install
   --enable-grid-view      Build the contacts grid view [default=disabled]
 
 Optional Packages:
@@ -1662,7 +1673,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ubuntuone-client-gnome configure 1.7.1
+ubuntuone-client-gnome configure 2.0.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1940,7 +1951,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ubuntuone-client-gnome $as_me 1.7.1, which was
+It was created by ubuntuone-client-gnome $as_me 2.0.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2757,7 +2768,7 @@
 
 # Define the identity of the package.
  PACKAGE='ubuntuone-client-gnome'
- VERSION='1.7.1'
+ VERSION='2.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5196,13 +5207,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5199: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5210: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5202: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5213: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5205: output\"" >&5)
+  (eval echo "\"\$as_me:5216: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6407,7 +6418,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6410 "configure"' > conftest.$ac_ext
+  echo '#line 6421 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7936,11 +7947,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7939: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7943: \$? = $ac_status" >&5
+   echo "$as_me:7954: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8275,11 +8286,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8278: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8289: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8282: \$? = $ac_status" >&5
+   echo "$as_me:8293: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8380,11 +8391,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8394: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8387: \$? = $ac_status" >&5
+   echo "$as_me:8398: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8435,11 +8446,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8438: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8449: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8442: \$? = $ac_status" >&5
+   echo "$as_me:8453: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10819,7 +10830,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10822 "configure"
+#line 10833 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10915,7 +10926,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10918 "configure"
+#line 10929 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11862,6 +11873,267 @@
 fi
 
 # Stuff we need to build the extension shlib
+# Check if we are on nautilus 3.0 or newer
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_nautilus_30=yes
+
+
+  # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+  enableval=$enable_schemas_compile; case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5  ;;
+                 esac
+fi
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.16
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+  gsettingsschemadir=${datadir}/glib-2.0/schemas
+
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GLIB_COMPILE_SCHEMAS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+  else
+    :
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
+
+
+
+
+
+
+else
+  have_nautilus_30=no
+fi
+if test "x$have_nautilus_30" = "xyes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_NAUTILUS_30 1
+_ACEOF
+
+   NAUTILUS_GCONF_DEP="gconf-2.0 >= 2.31.1"
+else
+   NAUTILUS_GCONF_DEP="gconf-2.0"
+fi
+ if test "x$have_nautilus_30" = "xyes"; then
+  HAVE_NAUTILUS_30_TRUE=
+  HAVE_NAUTILUS_30_FALSE='#'
+else
+  HAVE_NAUTILUS_30_TRUE='#'
+  HAVE_NAUTILUS_30_FALSE=
+fi
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
@@ -11871,12 +12143,12 @@
     pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 \$NAUTILUS_GCONF_DEP\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7" 2>/dev/null`
+  pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11887,12 +12159,12 @@
     pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 \$NAUTILUS_GCONF_DEP\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7" 2>/dev/null`
+  pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -11912,14 +12184,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7" 2>&1`
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP" 2>&1`
         else
-	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7" 2>&1`
+	        NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NAUTILUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7) were not met:
+	as_fn_error $? "Package requirements (libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP) were not met:
 
 $NAUTILUS_PKG_ERRORS
 
@@ -12116,6 +12388,267 @@
 
 
 # Dependencies for the gnome-settings-daemon plugin
+# Check if we are on gnome-settings-daemon 3.0 or newer
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon >= 3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon >= 3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_gsd_30=yes
+
+
+  # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+  enableval=$enable_schemas_compile; case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5  ;;
+                 esac
+fi
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.16
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+  gsettingsschemadir=${datadir}/glib-2.0/schemas
+
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GLIB_COMPILE_SCHEMAS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+  else
+    :
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
+
+
+
+
+
+
+else
+  have_gsd_30=no
+fi
+if test "x$have_gsd_30" = "xyes"; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GSD_30 1
+_ACEOF
+
+   GSD_GCONF_DEP="gconf-2.0 >= 2.31.1"
+else
+   GSD_GCONF_DEP="gconf-2.0"
+fi
+ if test "x$have_gsd_30" = "xyes"; then
+  HAVE_GSD_30_TRUE=
+  HAVE_GSD_30_FALSE='#'
+else
+  HAVE_GSD_30_TRUE='#'
+  HAVE_GSD_30_FALSE=
+fi
+
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SETTINGS_PLUGIN" >&5
@@ -12127,21 +12660,21 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        \$GSD_GCONF_DEP
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SETTINGS_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -12155,21 +12688,21 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        \$GSD_GCONF_DEP
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SETTINGS_PLUGIN_LIBS=`$PKG_CONFIG --libs "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 " 2>/dev/null`
 else
   pkg_failed=yes
@@ -12192,14 +12725,14 @@
         if test $_pkg_short_errors_supported = yes; then
 	        SETTINGS_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 " 2>&1`
         else
 	        SETTINGS_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -12207,8 +12740,8 @@
 
 	as_fn_error $? "Package requirements (gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 ) were not met:
 
 $SETTINGS_PLUGIN_PKG_ERRORS
@@ -12241,19 +12774,6 @@
 $as_echo "yes" >&6; }
 
 fi
-# Check if we are on gnome-settingsd-daemon 3.0 or newer
-if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-settings-daemon >= 3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-settings-daemon >= 3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GSD_30 1
-_ACEOF
-
-fi
 
 
 
@@ -12394,6 +12914,14 @@
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${HAVE_NAUTILUS_30_TRUE}" && test -z "${HAVE_NAUTILUS_30_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_NAUTILUS_30\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GSD_30_TRUE}" && test -z "${HAVE_GSD_30_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GSD_30\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -12802,7 +13330,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ubuntuone-client-gnome $as_me 1.7.1, which was
+This file was extended by ubuntuone-client-gnome $as_me 2.0.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12868,7 +13396,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ubuntuone-client-gnome config.status 1.7.1
+ubuntuone-client-gnome config.status 2.0.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-08-11 12:52:11 +0000
+++ configure.ac	2011-09-27 18:40:29 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client-gnome], [1.7.1])
+AC_INIT([ubuntuone-client-gnome], [2.0.0])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
@@ -48,7 +48,21 @@
 fi
 
 # Stuff we need to build the extension shlib
-PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0 libebook-1.2 gconf-2.0 libsyncdaemon-1.0 >= 1.7])
+# Check if we are on nautilus 3.0 or newer
+PKG_CHECK_EXISTS([libnautilus-extension >= 3.0],
+    [have_nautilus_30=yes
+     GLIB_GSETTINGS()],
+    [have_nautilus_30=no])
+if test "x$have_nautilus_30" = "xyes"; then
+   AC_DEFINE_UNQUOTED([HAVE_NAUTILUS_30], [1],
+                      [If using nautilus 3.0 or newer])
+   NAUTILUS_GCONF_DEP="gconf-2.0 >= 2.31.1"
+else
+   NAUTILUS_GCONF_DEP="gconf-2.0"
+fi
+AM_CONDITIONAL([HAVE_NAUTILUS_30], [test "x$have_nautilus_30" = "xyes"])
+
+PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= 2.6.0 libebook-1.2 libsyncdaemon-1.0 >= 1.7 $NAUTILUS_GCONF_DEP])
 AC_SUBST(NAUTILUS_CFLAGS)
 AC_SUBST(NAUTILUS_LIBS)
 
@@ -81,17 +95,26 @@
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 # Dependencies for the gnome-settings-daemon plugin
+# Check if we are on gnome-settings-daemon 3.0 or newer
+PKG_CHECK_EXISTS([gnome-settings-daemon >= 3.0],
+    [have_gsd_30=yes
+     GLIB_GSETTINGS()],
+    [have_gsd_30=no])
+if test "x$have_gsd_30" = "xyes"; then
+   AC_DEFINE_UNQUOTED([HAVE_GSD_30], [1],
+                      [If using gnome-settings-daemon 3.0 or newer])
+   GSD_GCONF_DEP="gconf-2.0 >= 2.31.1"
+else
+   GSD_GCONF_DEP="gconf-2.0"
+fi
+AM_CONDITIONAL([HAVE_GSD_30], [test "x$have_gsd_30" = "xyes"])
+
 PKG_CHECK_MODULES(SETTINGS_PLUGIN,
         gnome-settings-daemon
         gio-2.0
-        gconf-2.0
         libsyncdaemon-1.0 >= 1.7
+        $GSD_GCONF_DEP
 )
-# Check if we are on gnome-settingsd-daemon 3.0 or newer
-PKG_CHECK_EXISTS([gnome-settings-daemon >= 3.0],
-    AC_DEFINE_UNQUOTED([HAVE_GSD_30], [1],
-                       [If using gnome-settings-daemon 3.0 or newer]),
-    [])
 AC_SUBST(SETTINGS_PLUGIN_CFLAGS)
 AC_SUBST(SETTINGS_PLUGIN_LIBS)
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-06 17:49:52 +0000
+++ debian/changelog	2011-09-27 18:40:29 +0000
@@ -1,3 +1,18 @@
+ubuntuone-client-gnome (2.0.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Share dialog has extremely small contacts widget (LP: #854754)
+    - The g-s-d integration doesn't work in Oneiric (LP: #856331)
+    - Stop using gconf in Oneiric (LP: #800717)
+    - Untranslated plural strings (LP: #786617)
+  * debian/control:
+    - Update dependencies to be more correct
+    - Require gconf >= 2.31.1 for gsettings-data-convert support
+  * debian/ubuntuone.gschema.override:
+    - Removed as is no longer necessary to support gsettings
+
+ -- Rodney Dawes <dobey@lunatari>  Tue, 27 Sep 2011 14:30:53 -0400
+
 ubuntuone-client-gnome (1.7.1-0ubuntu3) oneiric; urgency=low
 
   * Rebuild to drop dependency on libebook1.2-11.

=== modified file 'debian/control'
--- debian/control	2011-08-11 12:52:11 +0000
+++ debian/control	2011-09-27 18:40:29 +0000
@@ -10,9 +10,9 @@
  intltool (>= 0.40.0),
  libdbus-glib-1-dev (>= 0.70),
  libebook1.2-dev,
- libgconf2-dev,
+ libgconf2-dev (>= 2.31.1),
  libnautilus-extension-dev (>= 2.6.0),
- libsyncdaemon-1.0-dev (>= 1.7.0),
+ libsyncdaemon-1.0-dev (>= 2.0.0),
  libtool,
  pkg-config (>= 0.19)
 Standards-Version: 3.9.1
@@ -22,8 +22,9 @@
 Section: gnome
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- ubuntuone-client (>= 1.7.1),
- gnome-settings-daemon
+ ubuntuone-client (>= 2.0.0),
+ gnome-settings-daemon,
+ gconf2 (>= 2.31.1)
 Replaces: ubuntuone-client (<= 1.1.1)
 Breaks: ubuntuone-client (<= 1.1.1)
 Suggests: ubuntuone-client-gnome-dbg

=== removed file 'debian/ubuntuone.gschema.override'
--- debian/ubuntuone.gschema.override	2011-08-11 12:52:11 +0000
+++ debian/ubuntuone.gschema.override	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[org.gnome.settings-daemon.plugins.ubuntuone]
-active=true
-priority=7
-

=== modified file 'gsd/Makefile.am'
--- gsd/Makefile.am	2011-08-11 12:52:11 +0000
+++ gsd/Makefile.am	2011-09-27 18:40:29 +0000
@@ -3,6 +3,20 @@
 plugin_LTLIBRARIES = \
 	libubuntuone.la
 
+gschema_in_files = gsd-ubuntuone.gschema.xml.in.in
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
+
+if HAVE_GSD_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
+
 libubuntuone_la_SOURCES = \
 	gsd-ubuntuone.h \
 	gsd-ubuntuone.c
@@ -29,6 +43,7 @@
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
 EXTRA_DIST = \
+	$(gschema_in_files) \
 	$(plugin_in_files)
 
 CLEANFILES = \

=== modified file 'gsd/Makefile.in'
--- gsd/Makefile.in	2011-08-11 12:52:11 +0000
+++ gsd/Makefile.in	2011-09-27 18:40:29 +0000
@@ -145,11 +145,13 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSD_INTLTOOL_PLUGIN_RULE = @GSD_INTLTOOL_PLUGIN_RULE@
 GSD_PLUGINDIR_NAME = @GSD_PLUGINDIR_NAME@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -224,6 +226,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -257,6 +260,9 @@
 plugin_LTLIBRARIES = \
 	libubuntuone.la
 
+gschema_in_files = gsd-ubuntuone.gschema.xml.in.in
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
+@HAVE_GSD_30_TRUE@gsettingsdir = $(datadir)/glib-2.0/schemas
 libubuntuone_la_SOURCES = \
 	gsd-ubuntuone.h \
 	gsd-ubuntuone.c
@@ -282,6 +288,7 @@
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 EXTRA_DIST = \
+	$(gschema_in_files) \
 	$(plugin_in_files)
 
 CLEANFILES = \
@@ -629,6 +636,13 @@
 	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 
+@HAVE_GSD_30_TRUE@%.gschema.xml.in: %.gschema.xml.in.in
+@HAVE_GSD_30_TRUE@	$(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
+
+@HAVE_GSD_30_TRUE@@INTLTOOL_XML_NOMERGE_RULE@
+
+@HAVE_GSD_30_TRUE@@GSETTINGS_RULES@
+
 @GSD_INTLTOOL_PLUGIN_RULE@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

=== modified file 'gsd/gsd-ubuntuone.c'
--- gsd/gsd-ubuntuone.c	2011-08-11 12:52:11 +0000
+++ gsd/gsd-ubuntuone.c	2011-09-27 18:40:29 +0000
@@ -24,15 +24,22 @@
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
 #include <gio/gio.h>
+
+#ifndef HAVE_GSD_30
 #include <gconf/gconf-client.h>
+#endif
 
 #include "gnome-settings-daemon/gnome-settings-plugin.h"
 #include "gsd-ubuntuone.h"
 
 GNOME_SETTINGS_PLUGIN_REGISTER (GsdUbuntuOne, gsd_ubuntuone)
 
+#ifdef HAVE_GSD_30
+#define SETTINGS_DOMAIN "org.gnome.settings-daemon.plugins.ubuntuone"
+#define SETTINGS_BOOKMARK_KEY "checked-bookmark-file"
+#else
 #define CHECKED_BOOKMARK_FILE_KEY "/apps/gnome_settings_daemon/plugins/ubuntuone/checked_bookmark_file"
-
+#endif
 
 static void
 bookmark_file_loaded (GObject *source, GAsyncResult *res, gpointer user_data)
@@ -68,10 +75,19 @@
                                                      NULL,
                                                      FALSE,
                                                      0, NULL, NULL, &error)) {
+#ifdef HAVE_GSD_30
+                                GSettings *settings;
+
+                                settings = g_settings_new (SETTINGS_DOMAIN);
+                                g_settings_set_boolean (settings, SETTINGS_BOOKMARK_KEY, TRUE);
+                                g_object_unref (settings);
+#else
                                 GConfClient *conf_client;
 
                                 conf_client = gconf_client_get_default ();
                                 gconf_client_set_bool (conf_client, CHECKED_BOOKMARK_FILE_KEY, TRUE, NULL);
+                                g_object_unref (conf_client);
+#endif
                         } else {
                                 g_warning ("Could not save bookmarks file: %s\n", error->message);
                                 g_error_free (error);
@@ -91,38 +107,49 @@
 check_bookmark_file (void)
 {
         gchar *filename;
+        gboolean already_checked = FALSE;
+
+        /* We only check the bookmark file if we haven't already done so */
+#ifdef HAVE_GSD_30
+        GSettings *settings;
+
+        settings = g_settings_new (SETTINGS_DOMAIN);
+        already_checked = g_settings_get_boolean (settings, SETTINGS_BOOKMARK_KEY);
+        g_object_unref (settings);
+#else
+        GError *error = NULL;
         GConfClient *conf_client;
-        GError *error = NULL;
 
-        /* We only check the bookmark file if we haven't already done so */
         conf_client = gconf_client_get_default ();
-        if (!gconf_client_get_bool (conf_client, CHECKED_BOOKMARK_FILE_KEY, &error)) {
-                if (error == NULL) {
-                        gchar *u1_folder;
-
-                        u1_folder = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
-                        if (g_file_test ((const gchar *) u1_folder, G_FILE_TEST_IS_DIR)) {
-                                /* Load the bookmark file */
-                                filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL);
-                                if (filename != NULL) {
-                                        GFile *file;
-
-                                        file = g_file_new_for_path (filename);
-                                        g_file_load_contents_async (file, NULL, bookmark_file_loaded, NULL);
-
-                                        g_object_unref (G_OBJECT (file));
-                                        g_free (filename);
-                                }
-                        }
-
-                        g_free (u1_folder);
-                } else {
-                        g_warning ("Error getting settings: %s\n", error->message);
-                        g_error_free (error);
-                }
-        }
-
+        already_checked = gconf_client_get_bool (conf_client, CHECKED_BOOKMARK_FILE_KEY, &error);
         g_object_unref (conf_client);
+
+        if (error != NULL) {
+                g_warning ("Error getting settings: %s\n", error->message);
+                g_error_free (error);
+                already_checked = TRUE;
+        }
+#endif
+        if (!already_checked) {
+                gchar *u1_folder;
+
+                u1_folder = g_build_filename (g_get_home_dir (), "Ubuntu One", NULL);
+                if (g_file_test ((const gchar *) u1_folder, G_FILE_TEST_IS_DIR)) {
+                        /* Load the bookmark file */
+                        filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL);
+                        if (filename != NULL) {
+                                GFile *file;
+
+                                file = g_file_new_for_path (filename);
+                                g_file_load_contents_async (file, NULL, bookmark_file_loaded, NULL);
+
+                                g_object_unref (G_OBJECT (file));
+                                g_free (filename);
+                        }
+                }
+
+                g_free (u1_folder);
+        }
 }
 
 static void

=== added file 'gsd/gsd-ubuntuone.gschema.xml.in.in'
--- gsd/gsd-ubuntuone.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ gsd/gsd-ubuntuone.gschema.xml.in.in	2011-09-27 18:40:29 +0000
@@ -0,0 +1,14 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.plugins.ubuntuone" path="/org/gnome/settings-daemon/plugins/ubuntuone/">
+    <key name="active" type="b">
+      <default>true</default>
+      <summary>Enable Ubuntu One features</summary>
+      <description>Whether integration of Ubuntu One with gnome-settings-daemon is enabled or not.</description>
+    </key>
+    <key name="priority" type="i">
+      <default>7</default>
+      <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>
+  </schema>
+</schemalist>

=== modified file 'nautilus/Makefile.in'
--- nautilus/Makefile.in	2011-08-11 12:52:11 +0000
+++ nautilus/Makefile.in	2011-09-27 18:40:29 +0000
@@ -183,11 +183,13 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSD_INTLTOOL_PLUGIN_RULE = @GSD_INTLTOOL_PLUGIN_RULE@
 GSD_PLUGINDIR_NAME = @GSD_PLUGINDIR_NAME@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -262,6 +264,7 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2011-08-11 12:52:11 +0000
+++ nautilus/contacts-view.c	2011-09-27 18:40:29 +0000
@@ -33,9 +33,17 @@
 #define AVATAR_SIZE 24
 #endif
 
+static void contacts_view_init (ContactsView *cv);
+static void contacts_view_class_init (ContactsViewClass *klass);
+
 G_DEFINE_TYPE(ContactsView, contacts_view, GTK_TYPE_SCROLLED_WINDOW)
 
+#ifdef HAVE_NAUTILUS_30
+#define SETTINGS_DOMAIN "org.gnome.nautilus.extensions.ubuntuone"
+#define SETTINGS_CONTACTS_KEY "recently-used-contacts"
+#else
 #define RECENTLY_USED_CONTACTS_KEY "/apps/libubuntuone/recently-used"
+#endif
 
 #define CONTACTS_VIEW_COLUMN_NAME   0
 #define CONTACTS_VIEW_COLUMN_MARKUP 1
@@ -72,10 +80,17 @@
 		cv->recently_used = NULL;
 	}
 
+#ifdef HAVE_NAUTILUS_30
+	if (cv->settings != NULL) {
+		g_object_unref (G_OBJECT (cv->settings));
+		cv->settings = NULL;
+	}
+#else
 	if (cv->config_client != NULL) {
 		g_object_unref (G_OBJECT (cv->config_client));
 		cv->config_client = NULL;
 	}
+#endif
 
 	if (cv->source_list != NULL) {
 		g_object_unref (G_OBJECT (cv->source_list));
@@ -138,7 +153,18 @@
 	GSList *list = NULL;
 
 	g_hash_table_foreach (cv->recently_used, (GHFunc) recently_used_to_list_cb, &list);
+
+#ifdef HAVE_NAUTILUS_30
+	{
+		gchar **strv = e_client_util_slist_to_strv (list);
+		g_settings_set_strv (cv->settings, SETTINGS_CONTACTS_KEY,
+				     (const gchar * const *) strv);
+		g_strfreev (strv);
+	}
+#else
 	gconf_client_set_list (cv->config_client, RECENTLY_USED_CONTACTS_KEY, GCONF_VALUE_STRING, list, NULL);
+#endif
+
 	g_slist_free (list);
 }
 
@@ -554,15 +580,24 @@
 	cv->added_contacts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
 	/* Get recently used contacts */
+	cv->recently_used = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
+
+#ifdef HAVE_NAUTILUS_30
+	cv->settings = g_settings_new (SETTINGS_DOMAIN);
+	{
+		gchar **strv;
+
+		strv = g_settings_get_strv (cv->settings, SETTINGS_CONTACTS_KEY);
+		gl = e_client_util_strv_to_slist ((const gchar * const *) strv);
+		g_strfreev (strv);
+	}	
+#else
 	cv->config_client = gconf_client_get_default ();
-	cv->recently_used = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
-
-	for (gl = gconf_client_get_list (cv->config_client, RECENTLY_USED_CONTACTS_KEY, GCONF_VALUE_STRING, NULL);
-	     gl != NULL;
-	     gl = gl->next) {
-		g_hash_table_insert (cv->recently_used, gl->data, gl->data);
+	gl = gconf_client_get_list (cv->config_client, RECENTLY_USED_CONTACTS_KEY, GCONF_VALUE_STRING, NULL);
+#endif
+	for (; gl != NULL; gl = gl->next) {
+		g_hash_table_insert (cv->recently_used, g_strdup (gl->data), g_strdup (gl->data));
 	}
-
 	g_slist_free (gl);
 
 	/* Set up the scrolled window */

=== modified file 'nautilus/contacts-view.h'
--- nautilus/contacts-view.h	2011-08-11 12:52:11 +0000
+++ nautilus/contacts-view.h	2011-09-27 18:40:29 +0000
@@ -22,10 +22,15 @@
 #ifndef __CONTACTS_VIEW_H__
 #define __CONTACTS_VIEW_H__
 
-#include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 #include <libedataserver/e-source-list.h>
 #include <libebook/e-book.h>
+#ifdef HAVE_NAUTILUS_30
+#include <gio/gio.h>
+#include <libedataserver/e-client.h>
+#else
+#include <gconf/gconf-client.h>
+#endif
 
 #define TYPE_CONTACTS_VIEW                (contacts_view_get_type ())
 #define CONTACTS_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTACTS_VIEW, ContactsView))
@@ -37,7 +42,11 @@
 typedef struct {
 	GtkScrolledWindow parent;
 
+#ifdef HAVE_NAUTILUS_30
+	GSettings *settings;
+#else
 	GConfClient *config_client;
+#endif
 
 	/* Data from addressbooks */
 	ESourceList *source_list;

=== modified file 'nautilus/context-menu.c'
--- nautilus/context-menu.c	2011-08-11 12:52:11 +0000
+++ nautilus/context-menu.c	2011-09-27 18:40:29 +0000
@@ -166,10 +166,18 @@
 static void
 toggle_location_cb (NautilusMenuItem *item, gpointer user_data)
 {
+#ifdef HAVE_NAUTILUS_30
+    GSettings *settings;
+    settings = g_settings_new (SETTINGS_DOMAIN);
+    g_settings_set_boolean (settings, SETTINGS_SHOWN_KEY, !ubuntuone_is_location_bar_enabled ());
+    g_object_unref (settings);
+#else
 	GConfClient *conf_client;
 
 	conf_client = gconf_client_get_default ();
 	gconf_client_set_bool (conf_client, EXPANDER_SHOWN_KEY, !ubuntuone_is_location_bar_enabled (), NULL);
+    g_object_unref (conf_client);
+#endif
 }
 
 gboolean

=== modified file 'nautilus/location-widget.c'
--- nautilus/location-widget.c	2011-08-11 12:52:11 +0000
+++ nautilus/location-widget.c	2011-09-27 18:40:29 +0000
@@ -101,11 +101,16 @@
 	g_signal_handlers_disconnect_by_func (location->uon->syncdaemon, folder_created_cb, location);
 	g_signal_handlers_disconnect_by_func (location->uon->syncdaemon, folder_deleted_cb, location);
 
+#ifdef HAVE_NAUTILUS_30
+    if (location->settings != NULL)
+        g_object_unref (G_OBJECT (location->settings));
+#else
 	if (location->conf_notify_id != 0)
 		gconf_client_notify_remove (location->conf_client, location->conf_notify_id);
 
 	if (location->conf_client != NULL)
 		g_object_unref (G_OBJECT (location->conf_client));
+#endif
 
 	if (location->path != NULL)
 		g_free (location->path);
@@ -208,14 +213,19 @@
 	LocationWidget *location = LOCATION_WIDGET (user_data);
 	gboolean expander_status = gtk_expander_get_expanded (expander);
 
-        gconf_client_set_bool (location->conf_client,
-                               EXPANDER_STATUS_KEY,
-                               expander_status,
-                               NULL);
+#ifdef HAVE_NAUTILUS_30
+    g_settings_set_boolean (location->settings, SETTINGS_EXPAND_KEY, expander_status);
+#else
+    gconf_client_set_bool (location->conf_client,
+                           EXPANDER_STATUS_KEY,
+                           expander_status,
+                           NULL);
+#endif
 
 	return FALSE;
 }
 
+#ifndef HAVE_NAUTILUS_30
 static void
 config_changed_cb (GConfClient *client, guint cnx_id, GConfEntry *entry, gpointer user_data)
 {
@@ -230,6 +240,7 @@
                 location->expander_status = expanded;
 	}
 }
+#endif
 
 static void
 allocate_cb (GtkWidget *label, GtkAllocation *allocation, gpointer user_data)
@@ -252,6 +263,11 @@
 	location->info_label = NULL;
 
 	/* Read expander status from GConf */
+#ifdef HAVE_NAUTILUS_30
+    location->settings = g_settings_new (SETTINGS_DOMAIN);
+    location->expander_status = g_settings_get_boolean (location->settings,
+                                                        SETTINGS_EXPAND_KEY);
+#else
 	location->conf_client = gconf_client_get_default ();
 	gconf_client_add_dir (location->conf_client, EXPANDER_STATUS_SECTION,
 			      GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
@@ -263,6 +279,7 @@
 							    NULL);
 	location->expander_status = gconf_client_get_bool (location->conf_client,
 							   EXPANDER_STATUS_KEY, NULL);
+#endif
 
 	/* Create the widgets in the interface */
 	hbox = gtk_hbox_new (FALSE, 0);
@@ -274,6 +291,10 @@
 	gtk_expander_set_use_markup (GTK_EXPANDER (location->expander), TRUE);
 	gtk_expander_set_expanded (GTK_EXPANDER (location->expander),
 				   location->expander_status);
+#ifdef HAVE_NAUTILUS_30
+    g_settings_bind (location->settings, SETTINGS_EXPAND_KEY,
+                     location->expander, "expanded", G_SETTINGS_BIND_DEFAULT);
+#endif
 	g_signal_connect_after (G_OBJECT (location->expander), "activate",
                                 G_CALLBACK (expander_clicked_cb), location);
 	gtk_box_pack_start (GTK_BOX (hbox), location->expander, TRUE, TRUE, 0);

=== modified file 'nautilus/location-widget.h'
--- nautilus/location-widget.h	2011-08-11 12:52:11 +0000
+++ nautilus/location-widget.h	2011-09-27 18:40:29 +0000
@@ -23,7 +23,6 @@
 #define __LOCATION_WIDGET_H__
 
 #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
 #include "ubuntuone-nautilus.h"
 
 #define TYPE_LOCATION_WIDGET                (location_widget_get_type ())
@@ -33,9 +32,17 @@
 #define IS_LOCATION_WIDGET_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LOCATION_WIDGET))
 #define LOCATION_WIDGET_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LOCATION_WIDGET, LocationWidgetClass))
 
+#ifdef HAVE_NAUTILUS_30
+#include <gio/gio.h>
+#define SETTINGS_DOMAIN "org.gnome.nautilus.extensions.ubuntuone"
+#define SETTINGS_EXPAND_KEY "expand-location"
+#define SETTINGS_SHOWN_KEY "show-location"
+#else
+#include <gconf/gconf-client.h>
 #define EXPANDER_STATUS_SECTION "/apps/ubuntuone/nautilus"
 #define EXPANDER_STATUS_KEY EXPANDER_STATUS_SECTION "/expand-location"
 #define EXPANDER_SHOWN_KEY EXPANDER_STATUS_SECTION "/show-location"
+#endif
 
 typedef struct {
 	GtkHBox parent;
@@ -50,8 +57,12 @@
 	GtkWidget *spinner;
 	GtkWidget *toggle_button;
 
+#ifdef HAVE_NAUTILUS_30
+    GSettings *settings;
+#else
 	GConfClient *conf_client;
 	guint conf_notify_id;
+#endif
 } LocationWidget;
 
 typedef struct {

=== modified file 'nautilus/share-dialog.c'
--- nautilus/share-dialog.c	2011-08-11 12:52:11 +0000
+++ nautilus/share-dialog.c	2011-09-27 18:40:29 +0000
@@ -116,31 +116,30 @@
 				(_("Share")), GTK_RESPONSE_ACCEPT,
 				NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                       GTK_RESPONSE_ACCEPT, FALSE);
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "ubuntuone");
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (dialog_response_cb), NULL);
 
 	area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	table = gtk_table_new (3, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 12);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 7);
-	gtk_widget_show (table);
-	gtk_container_add (GTK_CONTAINER (area), table);
+    table = gtk_vbox_new (FALSE, 12);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 7);
+    gtk_box_pack_start (GTK_BOX (area), table, TRUE, TRUE, 0);
+    gtk_widget_show (table);
 
 	dialog->user_picker = u1_contacts_picker_new ();
 	g_signal_connect (G_OBJECT (dialog->user_picker), "selection-changed",
 			  G_CALLBACK (picker_selection_changed_cb), dialog);
-	gtk_table_attach (GTK_TABLE (table), dialog->user_picker, 0, 2, 0, 2,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK, 3, 3);
+    gtk_box_pack_start (GTK_BOX (table), dialog->user_picker, TRUE, TRUE, 0);
 	gtk_widget_show (dialog->user_picker);
 
 	dialog->allow_mods = gtk_check_button_new_with_mnemonic (_("_Allow Modification"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->allow_mods), TRUE); /* Default to RW */
-	gtk_table_attach (GTK_TABLE (table), dialog->allow_mods, 0, 2, 2, 3, GTK_FILL, GTK_FILL, 3, 3);
+    /* Default to RW */
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->allow_mods),
+                                  TRUE);
+    gtk_box_pack_end (GTK_BOX (table), dialog->allow_mods, FALSE, FALSE, 0);
 	gtk_widget_show (dialog->allow_mods);
 
 	gtk_widget_set_size_request (GTK_WIDGET (dialog), 500, 450);

=== modified file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2011-08-11 12:52:11 +0000
+++ nautilus/u1-contacts-picker.c	2011-09-27 18:40:29 +0000
@@ -111,9 +111,9 @@
 	U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
 
 	if (strlen (gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry))) > 0)
-		label = g_strdup_printf (ngettext ("Found %d match", "Found %d matches", total), total);
+		label = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "Found %d match", "Found %d matches", total), total);
 	else
-		label = g_strdup_printf (ngettext ("%d contact", "%d contacts", total), total);
+		label = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "%d contact", "%d contacts", total), total);
 	gtk_label_set_text (GTK_LABEL (picker->priv->total_label), label);
 
 	g_free (label);
@@ -188,7 +188,7 @@
 			  G_CALLBACK (add_contact_cb), picker);
 	gtk_table_attach (GTK_TABLE (table), picker->priv->add_contact_button, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
 
-	picker->priv->total_label = gtk_label_new (ngettext ("0 contact", "0 contacts", 0));
+	picker->priv->total_label = gtk_label_new (g_dngettext (GETTEXT_PACKAGE, "0 contact", "0 contacts", 0));
 	gtk_widget_show (picker->priv->total_label);
 	gtk_table_attach (GTK_TABLE (table), picker->priv->total_label, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
 

=== modified file 'nautilus/utils.c'
--- nautilus/utils.c	2011-08-11 12:52:11 +0000
+++ nautilus/utils.c	2011-09-27 18:40:29 +0000
@@ -168,9 +168,17 @@
 gboolean
 ubuntuone_is_location_bar_enabled (void)
 {
-	GConfClient *conf_client;
+	gboolean show_location;
+
+#ifdef HAVE_NAUTILUS_30
+    GSettings *settings;
+
+    settings = g_settings_new (SETTINGS_DOMAIN);
+    show_location = g_settings_get_boolean (settings, SETTINGS_SHOWN_KEY);
+    g_object_unref (settings);
+#else
+    GConfClient *conf_client;
 	GConfValue * show_location_value;
-	gboolean show_location;
 
 	conf_client = gconf_client_get_default ();
 	show_location_value = gconf_client_get (conf_client, EXPANDER_SHOWN_KEY, NULL);
@@ -182,6 +190,8 @@
 		show_location = gconf_value_get_bool (show_location_value);
 		gconf_value_free (show_location_value);
 	}
+    g_object_unref (conf_client);
+#endif
 
 	return show_location;
 }

=== added file 'ubuntuone-client-gnome.convert'
--- ubuntuone-client-gnome.convert	1970-01-01 00:00:00 +0000
+++ ubuntuone-client-gnome.convert	2011-09-27 18:40:29 +0000
@@ -0,0 +1,9 @@
+[org.gnome.settings-daemon.plugins.ubuntuone]
+active = /apps/gnome_settings_daemon/plugins/ubuntuone/active
+priority = /apps/gnome_settings_daemon/plugins/ubuntuone/priority
+checked-bookmark-file = /apps/gnome_settings_daemon/plugins/ubuntuone/checked_bookmark_file
+
+[org.gnome.nautilus.nautlius.extensions.ubuntuone]
+recently-used-contacts = /apps/libubuntuone/recently-used
+expand-location = /apps/ubuntuone/nautilus/expand-location
+show-location = /apps/ubuntuone/nautilus/show-location