Merge lp:~daniel-wyatt/nautilus/ubuntu into lp:~ubuntu-desktop/nautilus/ubuntu

[Daniel Wyatt]

=== modified file 'debian/patches/interactive_search.patch'
--- debian/patches/interactive_search.patch	2014-01-22 01:51:01 +0000
+++ debian/patches/interactive_search.patch	2014-01-28 02:32:23 +0000
@@ -251,6 +251,15 @@
  }
  
  static void
+@@ -2415,6 +2538,8 @@
+ 
+ 	slot = NAUTILUS_WINDOW_SLOT (object);
+ 
++	isearch_dispose (slot);
++
+ 	nautilus_window_slot_clear_forward_list (slot);
+ 	nautilus_window_slot_clear_back_list (slot);
+ 
 @@ -2491,6 +2614,7 @@
  	oclass->constructed = nautilus_window_slot_constructed;
  	oclass->set_property = nautilus_window_slot_set_property;