Merge lp:~psusi/ubuntu/lucid/nautilus/openwith into lp:ubuntu/lucid-proposed/nautilus

[Phillip Susi]

02_dont_set_default.patch: SRU patch to make the "remember this
application" check box in the open with dialog box default
to off (LP: #662194)

[Marc Deslauriers (mdeslaur)]

Could you please update this with the actual patch that was used in Natty? Thanks!

review: Needs Fixing

[lp:~psusi/ubuntu/lucid/nautilus/openwith]

186. By Phillip Susi on 2011-03-28

02_dont_set_default.patch: SRU patch to remove the "remember
this application" check box in the open with dialog box
for folders (LP: #662194)

[Phillip Susi (psusi)]

Updated to the new patch.

review: Needs Resubmitting

[Kees Cook (kees)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-06 12:59:17 +0000
+++ debian/changelog	2011-03-28 01:24:31 +0000
@@ -1,3 +1,11 @@
+nautilus (1:2.30.1-0ubuntu1.2) lucid-proposed; urgency=low
+
+  * 02_dont_set_default.patch: SRU patch to remove the "remember
+    this application" check box in the open with dialog box
+    for folders (LP: #662194)
+
+ -- Phillip Susi <[e-mail]>  Sun, 27 Mar 2011 21:20:47 -0400
+
 nautilus (1:2.30.1-0ubuntu1.1) lucid-proposed; urgency=low
 
   * debian/patches/92_git_correct_delay_logic.patch:

=== added file 'debian/patches/02_dont_set_default.patch'
--- debian/patches/02_dont_set_default.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_dont_set_default.patch	2011-03-28 01:24:31 +0000
@@ -0,0 +1,29 @@
+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=637264
+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/662194
+# Description: hide checkbox to remember selection when opening folders
+diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c
+index 357e20c..300a92c 100644
+--- a/libnautilus-private/nautilus-open-with-dialog.c
++++ b/libnautilus-private/nautilus-open-with-dialog.c
+@@ -864,7 +864,7 @@ nautilus_open_with_dialog_init (NautilusOpenWithDialog *dialog)
+ 
+ 	/* Add remember this application checkbox - only visible in open mode */
+ 	dialog->details->checkbox = gtk_check_button_new ();
+-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), TRUE);
++	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), FALSE);
+ 	gtk_button_set_use_underline (GTK_BUTTON (dialog->details->checkbox), TRUE);
+ 	gtk_widget_show (GTK_WIDGET (dialog->details->checkbox));
+ 	gtk_box_pack_start (GTK_BOX (vbox), dialog->details->checkbox, FALSE, FALSE, 0);
+@@ -1031,6 +1031,12 @@ set_uri_and_type (NautilusOpenWithDialog *dialog,
+ 		gtk_label_set_text_with_mnemonic (GTK_LABEL (dialog->details->open_label),
+ 						  _("_Add"));
+ 		gtk_window_set_title (GTK_WINDOW (dialog), _("Add Application"));
++	} else {
++		if (g_str_equal (mime_type, "inode/directory")) {
++			gtk_widget_hide (dialog->details->checkbox);
++		} else {
++			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), TRUE);
++		}
+ 	}
+ 
+ 	gtk_label_set_markup (GTK_LABEL (dialog->details->label), label);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-06 12:59:17 +0000
+++ debian/patches/series	2011-03-28 01:24:31 +0000
@@ -1,4 +1,5 @@
 01_lpi.patch
+02_dont_set_default.patch
 03_menu_entry.patch
 #10_location_titlebar.patch
 10_load_session.patch