From 892a752819ff4b6844063643ce5cfef7daea6216 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Jul 21 2010 12:44:59 +0000
Subject: - Add missing gconf keys for saving window geometry (#508112)


---

diff --git a/nautilus-gconf-navigation_window_saved_geometry.patch b/nautilus-gconf-navigation_window_saved_geometry.patch
new file mode 100644
index 0000000..c5e980f
--- /dev/null
+++ b/nautilus-gconf-navigation_window_saved_geometry.patch
@@ -0,0 +1,34 @@
+From 4309418a12b43e87a4de1f44d0641a6c902a64ce Mon Sep 17 00:00:00 2001
+From: Gregory J. Horvath <hgj@sch.bme.hu>
+Date: Wed, 19 May 2010 12:34:46 +0000
+Subject: Add a missing GConf schema.
+
+---
+diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
+index 20e4137..2a2501d 100644
+--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
++++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
+@@ -202,6 +202,21 @@
+     </schema>
+     
+     <schema>
++      <key>/schemas/apps/nautilus/preferences/navigation_window_saved_geometry</key>
++      <applyto>/apps/nautilus/preferences/navigation_window_saved_geometry</applyto>
++      <owner>nautilus</owner>
++      <type>string</type>
++      <default></default>
++      <locale name="C">
++         <short>The geometry string for a navigation window.</short>
++         <long>
++           A string containing the saved geometry and coordinates string for
++           navigation windows.
++         </long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/nautilus/preferences/confirm_trash</key>
+       <applyto>/apps/nautilus/preferences/confirm_trash</applyto>
+       <owner>nautilus</owner>
+--
+cgit v0.8.3.1
diff --git a/nautilus-gconf-navigation_window_saved_maximized.patch b/nautilus-gconf-navigation_window_saved_maximized.patch
new file mode 100644
index 0000000..5ee8d5d
--- /dev/null
+++ b/nautilus-gconf-navigation_window_saved_maximized.patch
@@ -0,0 +1,33 @@
+From 97d736a0861a81f825698451249564e42d002d4b Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 19 May 2010 15:42:34 +0000
+Subject: Add another missing GConf schema.
+
+---
+diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in
+index 2a2501d..fd25f1a 100644
+--- a/libnautilus-private/apps_nautilus_preferences.schemas.in
++++ b/libnautilus-private/apps_nautilus_preferences.schemas.in
+@@ -215,6 +215,20 @@
+          </long>
+       </locale>
+     </schema>
++    
++    <schema>
++      <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>
++      <default></default>
++      <locale name="C">
++         <short>Whether the navigation window should be maximized.</short>
++         <long>
++           Whether the navigation window should be maximized by default.
++         </long>
++      </locale>
++    </schema>
+ 
+     <schema>
+       <key>/schemas/apps/nautilus/preferences/confirm_trash</key>
+--
+cgit v0.8.3.1
diff --git a/nautilus.spec b/nautilus.spec
index 3727068..f374468 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.30.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
@@ -89,6 +89,8 @@ Patch17:	nautilus-filetype-symlink-fix.patch
 
 # from upstream
 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
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -129,6 +131,8 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .hide-unmount
+%patch19 -p1 -b .saved-geometry
+%patch20 -p1 -b .saved-maximized
 
 %build
 
@@ -265,6 +269,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Wed Jul 21 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-4
+- Add missing gconf keys for saving window geometry (#508112)
+
 * Tue May  4 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-3
 - Remove .desktop entry in applications > system tools (#583790)