From 10ac01dd54d5081f98bf922d8eb8143616be2acf Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@fedoraproject.org>
Date: May 02 2008 18:29:51 +0000
Subject: - Default to "Ask what to do" for all actions (#444639)


---

diff --git a/nautilus-2.22-default-to-asking.patch b/nautilus-2.22-default-to-asking.patch
new file mode 100644
index 0000000..16b74a7
--- /dev/null
+++ b/nautilus-2.22-default-to-asking.patch
@@ -0,0 +1,11 @@
+--- nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in.orig	2008-05-02 14:05:28.000000000 -0400
++++ nautilus-2.22.2/libnautilus-private/apps_nautilus_preferences.schemas.in	2008-05-02 14:08:30.000000000 -0400
+@@ -122,7 +122,7 @@
+       <owner>nautilus</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default>[]</default>
++      <default>[x-content/audio-cdda,x-content/video-dvd,x-content/audio-player,x-content/image-dcf,x-content/video-vcd,x-content/video-svcd,x-content/image-picturecd,x-content/video-hddvd,x-content/audio-dvd,x-content/blank-bd,x-content/blank-cd,x-content/blank-dvd,x-content/blank-hddvd,x-content/video-bluray]</default>
+       <locale name="C">
+          <short>List of x-content/* types to ask the user what to do on insertion</short>
+          <long>
diff --git a/nautilus.spec b/nautilus.spec
index 50f9f5c..29f32b7 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
 Version: 	2.22.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
@@ -99,6 +99,9 @@ Patch12:	nautilus-cd-burner-move-workaround.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=530720
 Patch13:	nautilus-copymove_inside_itself.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=444639
+Patch14:        nautilus-2.22-default-to-asking.patch
+
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -140,6 +143,7 @@ for writing nautilus extensions.
 %patch11 -p1 -b .fix-open-folder
 %patch12 -p0 -b .cd-burner
 %patch13 -p0 -b .recurse
+%patch14 -p1 -b .default-to-asking
 
 %build
 
@@ -250,6 +254,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Fri May  2 2008 David Zeuthen <davidz@redhat.com> - 2.22.2-7
+- Default to "Ask what to do" for all actions (#444639)
+
 * Wed Apr 30 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.22.2-6
 - Mask file moving to nautilus-cd-burner window as copy operation (#443944)
 - Don't allow recursive move/copy into itself (gnomebz #530720)