← Back to branch summary

~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1

« back to all changes in this revision

Viewing changes to src/View/Widgets/LocationBar.vala

  • Committer: Jeremy Wootten
  • Date: 2017-01-13 13:31:06 UTC
  • mfrom: (2412.1.32 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20170113133106-v9l164ms13lh3p0a
Merge trunk to r2444 and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/Widgets/LocationBar.vala
50
50
            search_results = new SearchResults (bread as Gtk.Widget);
51
51
            connect_additional_signals ();
52
52
            show_refresh_icon ();
53
 
 
54
 
            key_press_event.connect ((event) => {
55
 
                return has_focus && bread.key_press_event (event);
56
 
            });
57
53
        }
58
54
 
59
55
        private void connect_additional_signals () {
192
188
                return false;
193
189
            }
194
190
 
 
191
//~ <<<<<<< TREE
 
192
//~ =======
 
193
//~             search_results.set_search_current_directory_only (local_only);
 
194
//~             search_results.set_begins_with_only (begins_with_only);
 
195
 
 
196
//~ >>>>>>> MERGE-SOURCE
195
197
            if (!search_mode) {
196
198
                /* Initialise search mode but do not search until first character has been received */
197
199
                if (set_focussed ()) {