Merge lp:~rodrigo-moya/ubuntu/natty/nautilus/fix-662194 into lp:~ubuntu-desktop/nautilus/ubuntu

[Rodrigo Moya]

Patch sent upstream for hiding the checkbox for folders

[lp:~rodrigo-moya/ubuntu/natty/nautilus/fix-662194]

130. By Rodrigo Moya on 2011-03-22

Set the checkbox to FALSE by default to avoid unwanted results

131. By Rodrigo Moya on 2011-03-22

Keep description in patch

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-15 14:12:56 +0000
+++ debian/changelog	2011-03-22 13:05:05 +0000
@@ -1,3 +1,11 @@
+nautilus (1:2.32.2.1-0ubuntu10) UNRELEASED; urgency=low
+
+  * debian/patches/02_dont_set_default.patch
+    - Updated to hide 'Remember this app...' checkbox for directories in the
+      'Open with' dialog (LP: #662194)
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 22 Mar 2011 12:57:56 +0100
+
 nautilus (1:2.32.2.1-0ubuntu9) natty; urgency=low
 
   * 17_disable_locked_automounting.patch: Fix g_bus_unwatch_name() assertion

=== modified file 'debian/patches/02_dont_set_default.patch'
--- debian/patches/02_dont_set_default.patch	2010-12-15 14:21:10 +0000
+++ debian/patches/02_dont_set_default.patch	2011-03-22 13:05:05 +0000
@@ -1,11 +1,11 @@
 # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=637264
 # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/662194
-# Description: don't change the default handler by default
-Index: nautilus-2.32.2/libnautilus-private/nautilus-open-with-dialog.c
-===================================================================
---- nautilus-2.32.2.orig/libnautilus-private/nautilus-open-with-dialog.c	2010-12-15 13:36:33.076155730 +0100
-+++ nautilus-2.32.2/libnautilus-private/nautilus-open-with-dialog.c	2010-12-15 13:36:47.000000000 +0100
-@@ -864,7 +864,7 @@
+# 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 ();
@@ -14,3 +14,16 @@
  	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);