← Back to branch summary

~elementary-apps/pantheon-files/trunk

« back to all changes in this revision

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

Merge updates from parent and resolve conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/Widgets/TopMenu.vala
112
112
            location_bar.escape.connect (() => {escape ();});
113
113
        }
114
114
 
115
 
        public bool enter_search_mode (bool local_only, bool begins_with_only) {
116
 
            return location_bar.enter_search_mode (local_only, begins_with_only);
 
115
        public bool enter_search_mode () {
 
116
            return location_bar.enter_search_mode ();
117
117
        }
118
118
 
119
119
        public bool enter_navigate_mode () {