Merged patch SF #3407290: Migrate to GSettings (by Mikel Olasagasti).

Author: lwindolf

.gitignore

@@ -20,6 +20,8 @@ libtool
 liferea.desktop
 ltmain.sh
 missing
+net.sf.liferea.gschema.valid
+net.sf.liferea.gschema.xml
 po/.intltool-merge-cache
 po/Makefile.in.in
 po/POTFILES

AUTHORS

@@ -65,7 +65,7 @@ Lars Strojny <lars@strojny.net>				Statusbar improvements
 							WebKit Rendering Support
 Jon Forsberg <zzed2004@users.sf.net>			Enclosure context menu patch
 Mathie Leplatre						Option to filter feed list
-Mikel Olasagasti <mikel@olasagasti.info>		GeoRSS support
+Mikel Olasagasti Uranga <mikel@olasagasti.info>		GeoRSS support, Gsettings port
 Rupert Swarbrick <rswarbrick@users.sf.net>		OPML duplicate id fix
 Yaron Sheffer <yaronf@gmx.com>				Bidi support for LTR and RTL locales
 Ricardo Cruz <rmcruz@users.sf.net>			Many GUI improvements

ChangeLog

@@ -1,5 +1,7 @@
 	To be released
 
+	* Patch SF #3407290: Migrate to GSettings
+	  (by Mikel Olasagasti)
 	* Patch SF #3579177: Change .desktop category to News;Feed;
 	  (by Stanislav Brabec)
 

Makefile.am

@@ -7,9 +7,6 @@ desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = liferea.schemas
-
 cssdir = $(pkgdatadir)/css
 css_DATA = \
 	css/liferea.css \
@@ -26,11 +23,13 @@ plugin_DATA = \
 	plugins/media-player.py \
 	plugins/media-player.plugin
 
-gsettings_SCHEMAS = org.gnome.liferea.gschema.xml
+gsettings_SCHEMAS = net.sf.liferea.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
+	net.sf.liferea.gschema.xml.in \
+	liferea.convert \
 	po/liferea.pot \
 	$(desktop_in_files) \
 	$(desktop_DATA) \
@@ -40,14 +39,12 @@ EXTRA_DIST = \
 	$(plugin_DATA) \
 	$(gsettings_SCHEMAS)
 
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA)
-endif
-	@$(NORMAL_INSTALL)
-
 DISTCLEANFILES = \
 	liferea.desktop \
 	intltool-extract \
 	intltool-merge \
-	intltool-update
+	intltool-update \
+	$(gsettings_SCHEMAS)
+
+CLEANFILES = \
+	$(gsettings_SCHEMAS)

README

@@ -1,4 +1,4 @@
-This documentation was last updated for Liferea version 1.9 (13.09.2012).
+This documentation was last updated for Liferea version 1.10 (31.10.2012).
 
 Contents
 ========
@@ -70,7 +70,6 @@ The compilation and runtime dependencies are:
 Mandatory:
 
    gtk3
-   gconf2
    libxml2
    libxslt
    sqlite3

configure.ac

@@ -22,6 +22,7 @@ AC_HEADER_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
+GLIB_GSETTINGS
 
 AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
 AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
@@ -80,23 +81,13 @@ fi
 
 AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
 
-dnl Checking for gconftool-2
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-
-if test "x$GCONFTOOL" = xno; then
-        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-fi
-
-AM_GCONF_SOURCE_2
-
 ################################################################################
 # Mandatory library dependencies
 
 pkg_modules="	gtk+-3.0 >= 3.4.0
 		glib-2.0 >= 2.24.0
 		gio-2.0 >= 2.26.0
-		pango >= 1.4.0
-		gconf-2.0 >= 1.1.9 
+		pango >= 1.4.0 
 		libxml-2.0 >= 2.6.27
 		libxslt >= 1.1.19
 		sqlite3 >= 3.7.0