rpms/nautilus/F-13 nautilus-gconf-correct-type.patch, NONE, 1.1 nautilus-gconf-default-value.patch, NONE, 1.1 nautilus.spec, 1.314, 1.315

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15180

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-gconf-correct-type.patch 
	nautilus-gconf-default-value.patch 
Log Message:
* Wed Jul 21 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.30.1-5
- Set default value in order to avoid gconf warnings (#614715)


nautilus-gconf-correct-type.patch:
 apps_nautilus_preferences.schemas.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nautilus-gconf-correct-type.patch ---
>From f2e87dbcdb5535724a59ab9c69afe038b124b2bf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Sat, 19 Jun 2010 04:01:18 +0000
Subject: Use the right datatype in the schema

GConf calls it a bool, not a boolean.
---
diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index 8c5a910..fbc65fb 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -220,7 +220,7 @@
       <key>/schemas/apps/nautilus/preferences/navigation_window_saved_maximized</key>
       <applyto>/apps/nautilus/preferences/navigation_window_saved_maximized</applyto>
       <owner>nautilus</owner>
-      <type>boolean</type>
+      <type>bool</type>
       <default></default>
       <locale name="C">
          <short>Whether the navigation window should be maximized.</short>
--
cgit v0.8.3.1

nautilus-gconf-default-value.patch:
 apps_nautilus_preferences.schemas.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nautilus-gconf-default-value.patch ---
>From ac038a0d90a4d59b564803be2698bc883672ab84 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Wed, 21 Jul 2010 15:43:06 +0200
Subject: [PATCH] Set default value for the navigation_window_saved_maximized gconf key

And avoid gconftool messages like
WARNING: Failed to parse default value `' for schema (/schemas/apps/nautilus/preferences/navigation_window_saved_maximized)
---
 .../apps_nautilus_preferences.schemas.in           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
index fbc65fb..c83ee1b 100644
--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -221,7 +221,7 @@
       <applyto>/apps/nautilus/preferences/navigation_window_saved_maximized</applyto>
       <owner>nautilus</owner>
       <type>bool</type>
-      <default></default>
+      <default>false</default>
       <locale name="C">
          <short>Whether the navigation window should be maximized.</short>
          <long>
-- 
1.7.1.1



Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-13/nautilus.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- nautilus.spec	21 Jul 2010 12:44:59 -0000	1.314
+++ nautilus.spec	21 Jul 2010 14:11:22 -0000	1.315
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.30.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
@@ -91,6 +91,8 @@ Patch17:	nautilus-filetype-symlink-fix.p
 Patch18:	nautilus-2.30.1-hide-unmount-when-eject.patch
 Patch19:	nautilus-gconf-navigation_window_saved_geometry.patch
 Patch20:	nautilus-gconf-navigation_window_saved_maximized.patch
+Patch21:	nautilus-gconf-correct-type.patch
+Patch22:	nautilus-gconf-default-value.patch
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -133,6 +135,8 @@ for developing nautilus extensions.
 %patch18 -p1 -b .hide-unmount
 %patch19 -p1 -b .saved-geometry
 %patch20 -p1 -b .saved-maximized
+%patch21 -p1 -b .gconf-type
+%patch22 -p1 -b .gconf-default
 
 %build
 
@@ -269,6 +273,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Jul 21 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.30.1-5
+- Set default value in order to avoid gconf warnings (#614715)
+
 * Wed Jul 21 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.30.1-4
 - Add missing gconf keys for saving window geometry (#508112)