Skip to content

Commit 91a2154

Browse files
committed
Merged patch SF #3407290: Migrate to GSettings (by Mikel Olasagasti).
1 parent a0952be commit 91a2154

File tree

9 files changed

+332
-258
lines changed

9 files changed

+332
-258
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ libtool
2020
liferea.desktop
2121
ltmain.sh
2222
missing
23+
net.sf.liferea.gschema.valid
24+
net.sf.liferea.gschema.xml
2325
po/.intltool-merge-cache
2426
po/Makefile.in.in
2527
po/POTFILES

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Lars Strojny <lars@strojny.net> Statusbar improvements
6565
WebKit Rendering Support
6666
Jon Forsberg <zzed2004@users.sf.net> Enclosure context menu patch
6767
Mathie Leplatre Option to filter feed list
68-
Mikel Olasagasti <mikel@olasagasti.info> GeoRSS support
68+
Mikel Olasagasti Uranga <mikel@olasagasti.info> GeoRSS support, Gsettings port
6969
Rupert Swarbrick <rswarbrick@users.sf.net> OPML duplicate id fix
7070
Yaron Sheffer <yaronf@gmx.com> Bidi support for LTR and RTL locales
7171
Ricardo Cruz <rmcruz@users.sf.net> Many GUI improvements

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
To be released
22

3+
* Patch SF #3407290: Migrate to GSettings
4+
(by Mikel Olasagasti)
35
* Patch SF #3579177: Change .desktop category to News;Feed;
46
(by Stanislav Brabec)
57

Makefile.am

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ desktopdir = $(datadir)/applications
77
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
88
@INTLTOOL_DESKTOP_RULE@
99

10-
schemadir = @GCONF_SCHEMA_FILE_DIR@
11-
schema_DATA = liferea.schemas
12-
1310
cssdir = $(pkgdatadir)/css
1411
css_DATA = \
1512
css/liferea.css \
@@ -26,11 +23,13 @@ plugin_DATA = \
2623
plugins/media-player.py \
2724
plugins/media-player.plugin
2825

29-
gsettings_SCHEMAS = org.gnome.liferea.gschema.xml
26+
gsettings_SCHEMAS = net.sf.liferea.gschema.xml
3027
@INTLTOOL_XML_NOMERGE_RULE@
3128
@GSETTINGS_RULES@
3229

3330
EXTRA_DIST = \
31+
net.sf.liferea.gschema.xml.in \
32+
liferea.convert \
3433
po/liferea.pot \
3534
$(desktop_in_files) \
3635
$(desktop_DATA) \
@@ -40,14 +39,12 @@ EXTRA_DIST = \
4039
$(plugin_DATA) \
4140
$(gsettings_SCHEMAS)
4241

43-
install-data-local:
44-
if GCONF_SCHEMAS_INSTALL
45-
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA)
46-
endif
47-
@$(NORMAL_INSTALL)
48-
4942
DISTCLEANFILES = \
5043
liferea.desktop \
5144
intltool-extract \
5245
intltool-merge \
53-
intltool-update
46+
intltool-update \
47+
$(gsettings_SCHEMAS)
48+
49+
CLEANFILES = \
50+
$(gsettings_SCHEMAS)

README

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This documentation was last updated for Liferea version 1.9 (13.09.2012).
1+
This documentation was last updated for Liferea version 1.10 (31.10.2012).
22

33
Contents
44
========
@@ -70,7 +70,6 @@ The compilation and runtime dependencies are:
7070
Mandatory:
7171

7272
gtk3
73-
gconf2
7473
libxml2
7574
libxslt
7675
sqlite3

configure.ac

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ AC_HEADER_STDC
2222
AC_PROG_INSTALL
2323
AC_PROG_MAKE_SET
2424
AC_SYS_LARGEFILE
25+
GLIB_GSETTINGS
2526

2627
AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[compile without libnotify support]),,enable_libnotify=yes)
2728
AC_ARG_ENABLE(libindicate, AS_HELP_STRING([--disable-libindicate],[compile without libindicate support]),,enable_libindicate=yes)
@@ -80,23 +81,13 @@ fi
8081

8182
AM_CONDITIONAL(WITH_LIBINDICATE, test "x$enable_libindicate" = "xyes")
8283

83-
dnl Checking for gconftool-2
84-
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
85-
86-
if test "x$GCONFTOOL" = xno; then
87-
AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
88-
fi
89-
90-
AM_GCONF_SOURCE_2
91-
9284
################################################################################
9385
# Mandatory library dependencies
9486

9587
pkg_modules=" gtk+-3.0 >= 3.4.0
9688
glib-2.0 >= 2.24.0
9789
gio-2.0 >= 2.26.0
98-
pango >= 1.4.0
99-
gconf-2.0 >= 1.1.9
90+
pango >= 1.4.0
10091
libxml-2.0 >= 2.6.27
10192
libxslt >= 1.1.19
10293
sqlite3 >= 3.7.0

0 commit comments

Comments
 (0)