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

Proposed by Daniel Wyatt
Status: Merged
Merged at revision: 414
Proposed branch: lp:~daniel-wyatt/nautilus/ubuntu
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 19 lines (+9/-0)
1 file modified
debian/patches/interactive_search.patch (+9/-0)
To merge this branch: bzr merge lp:~daniel-wyatt/nautilus/ubuntu
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+203450@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
251 }251 }
252 252
253 static void253 static void
254@@ -2415,6 +2538,8 @@
255
256 slot = NAUTILUS_WINDOW_SLOT (object);
257
258+ isearch_dispose (slot);
259+
260 nautilus_window_slot_clear_forward_list (slot);
261 nautilus_window_slot_clear_back_list (slot);
262
254@@ -2491,6 +2614,7 @@263@@ -2491,6 +2614,7 @@
255 oclass->constructed = nautilus_window_slot_constructed;264 oclass->constructed = nautilus_window_slot_constructed;
256 oclass->set_property = nautilus_window_slot_set_property;265 oclass->set_property = nautilus_window_slot_set_property;

Subscribers

People subscribed via source and target branches

to all changes: