rpms/evince/devel evince-settings-migration.patch, NONE, 1.1 evince.spec, 1.199, 1.200

Sat May 22 00:35:06 UTC 2010

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18041

Modified Files:
	evince.spec 
Added Files:
	evince-settings-migration.patch 
Log Message:
Migrate settings from GConf to dconf


evince-settings-migration.patch:
 data/Makefile.am                     |   18 ++++++++++--------
 data/evince.convert                  |    7 +++++++
 data/org.gnome.Evince.gschema.xml.in |    2 +-
 shell/ev-window.c                    |    2 +-
 shell/main.c                         |    5 -----
 5 files changed, 19 insertions(+), 15 deletions(-)

--- NEW FILE evince-settings-migration.patch ---
diff -up evince-2.31.1/data/evince.convert.settings-migration evince-2.31.1/data/evince.convert
--- evince-2.31.1/data/evince.convert.settings-migration	2010-05-21 19:57:12.668695278 -0400
+++ evince-2.31.1/data/evince.convert	2010-05-21 19:57:12.668695278 -0400
@@ -0,0 +1,7 @@
+[org.gnome.Evince]
+override-restrictions = /apps/evince/override_restrictions
+
+[org.gnome.Evince.Default]
+show-toolbar = /apps/evince/default/show-toolbar
+show-sidebar = /apps/evince/default/show-sidebar
+# window-ratio = /apps/evince/default/window-ratio
diff -up evince-2.31.1/data/Makefile.am.settings-migration evince-2.31.1/data/Makefile.am
--- evince-2.31.1/data/Makefile.am.settings-migration	2010-05-04 04:22:35.000000000 -0400
+++ evince-2.31.1/data/Makefile.am	2010-05-21 19:57:12.669696745 -0400
@@ -54,15 +54,16 @@ endif
 # gsettingsschemadir and gschema_compile are defined by the GLIB_GSETTINGS
 # macro in configure.ac
 gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in
-gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+
+.PRECIOUS: $(gsettings_SCHEMAS)
+
 @INTLTOOL_XML_NOMERGE_RULE@
-# This rule will check your schemas for validity before installation
-# Uncomment when porting is done
-# GSETTINGS_CHECK_RULE
-if GSETTINGS_SCHEMAS_INSTALL
-install-data-hook:
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --allow-any-name $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir)
-endif
+
+ at GSETTINGS_RULES@
+
+gsettingsconvertdir = $(datadir)/GConf/gsettings
+gsettingsconvert_DATA = evince.convert
 
 #
 # GTK icon cache
@@ -94,6 +95,7 @@ EXTRA_DIST =					\
 	org.gnome.evince.Daemon.service.in	\
 	$(man_MANS)				\
 	evince.ico				\
+	evince.convert				\
 	$(NULL)
 
 #
diff -up evince-2.31.1/data/org.gnome.Evince.gschema.xml.in.settings-migration evince-2.31.1/data/org.gnome.Evince.gschema.xml.in
--- evince-2.31.1/data/org.gnome.Evince.gschema.xml.in.settings-migration	2010-05-04 04:56:03.000000000 -0400
+++ evince-2.31.1/data/org.gnome.Evince.gschema.xml.in	2010-05-21 19:57:12.670691157 -0400
@@ -1,6 +1,6 @@
 <schemalist>
   <schema id="org.gnome.Evince" path="/apps/evince/" gettext-domain="evince">
-    <key name="override_restrictions" type="b">
+    <key name="override-restrictions" type="b">
       <default>true</default>
       <summary>Override document restrictions</summary>
       <description>Override document restrictions, like restriction to copy or to print.</description>
diff -up evince-2.31.1/shell/ev-window.c.settings-migration evince-2.31.1/shell/ev-window.c
--- evince-2.31.1/shell/ev-window.c.settings-migration	2010-05-04 07:39:11.000000000 -0400
+++ evince-2.31.1/shell/ev-window.c	2010-05-21 19:57:12.676680262 -0400
@@ -229,7 +229,7 @@ struct _EvWindowPrivate {
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
 #define GS_SCHEMA_NAME           "org.gnome.Evince"
-#define GS_OVERRIDE_RESTRICTIONS "override_restrictions"
+#define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
diff -up evince-2.31.1/shell/main.c.settings-migration evince-2.31.1/shell/main.c
--- evince-2.31.1/shell/main.c.settings-migration	2010-05-21 20:17:47.577682354 -0400
+++ evince-2.31.1/shell/main.c	2010-05-21 20:18:01.229682491 -0400
@@ -216,11 +216,6 @@ main (int argc, char *argv[])
 	GOptionContext *context;
 	GError         *error = NULL;
 
-#ifdef WITH_GCONF
-	/* Remove when porting is done */
-	g_setenv ("GSETTINGS_BACKEND", "gconf", FALSE);
-#endif
-
 #ifdef G_OS_WIN32
 
     if (fileno (stdout) != -1 &&


Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- evince.spec	17 May 2010 01:56:58 -0000	1.199
+++ evince.spec	22 May 2010 00:35:05 -0000	1.200
@@ -6,7 +6,7 @@
 
 Name:           evince
 Version:        2.31.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GFDL
@@ -16,6 +16,10 @@ Source0:        http://download.gnome.or
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
 
+# migrate user data from GConf to dconf
+Patch3:         evince-settings-migration.patch
+BuildRequires:  autoconf automake libtool intltool
+
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  poppler-glib-devel >= %{poppler_version}
@@ -112,6 +116,9 @@ It adds an additional tab called "Docume
 %prep
 %setup -q
 %patch2 -p1 -b .t1font-map
+%patch3 -p1 -b .settings-migration
+
+autoreconf -i -f
 
 %build
 %configure --disable-static --disable-scrollkeeper --disable-schemas-install \
@@ -191,6 +198,7 @@ glib-compile-schemas --allow-any-name %{
 %{_libexecdir}/evinced
 %{_datadir}/dbus-1/services/org.gnome.evince.Daemon.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Evince.gschema.xml
+%{_datadir}/GConf/gsettings/evince.convert
 
 %files libs
 %defattr(-,root,root,-)
@@ -234,6 +242,9 @@ glib-compile-schemas --allow-any-name %{
 %{_libdir}/nautilus/extensions-2.0/libevince-properties-page.so
 
 %changelog
+* Fri May 21 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.1-3
+- Migrate settings to dconf
+
 * Sun May 16 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.1-2
 - Compile GSettings schemas
 

