[gnote] Revert "Make enter key find next match when searching in note"
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Revert "Make enter key find next match when searching in note"
- Date: Mon, 28 Mar 2016 15:27:41 +0000 (UTC)
commit 38371fd90a417b48d1adfa461e4efe1091b5bbb0
Author: Aurimas Černius <aurisc4 gmail com>
Date: Mon Mar 28 18:25:41 2016 +0300
Revert "Make enter key find next match when searching in note"
This reverts commit 0e072fc09d066babf295b17df709a20f82cf681b.
src/recentchanges.cpp | 10 +---------
src/recentchanges.hpp | 1 -
2 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp
index 7c035f7..0a5ded8 100644
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@ -49,7 +49,6 @@ namespace gnote {
, m_search_box(0.5, 0.5, 0.0, 1.0)
, m_mapped(false)
, m_entry_changed_timeout(NULL)
- , m_search_dirty(false)
, m_window_menu_embedded(NULL)
, m_window_menu_default(NULL)
, m_keybinder(get_accel_group())
@@ -638,7 +637,6 @@ namespace gnote {
.connect(sigc::mem_fun(*this, &NoteRecentChanges::entry_changed_timeout));
}
- m_search_dirty = true;
std::string search_text = get_search_text();
if(search_text.empty()) {
SearchableItem *searchable_widget = dynamic_cast<SearchableItem*>(currently_embedded());
@@ -657,12 +655,7 @@ namespace gnote {
m_entry_changed_timeout->cancel();
}
- if(m_search_dirty) {
- entry_changed_timeout();
- }
- else {
- on_find_next_button_clicked();
- }
+ entry_changed_timeout();
}
void NoteRecentChanges::entry_changed_timeout()
@@ -678,7 +671,6 @@ namespace gnote {
SearchableItem *searchable_widget = dynamic_cast<SearchableItem*>(currently_embedded());
if(searchable_widget) {
searchable_widget->perform_search(search_text);
- m_search_dirty = false;
}
}
diff --git a/src/recentchanges.hpp b/src/recentchanges.hpp
index 9a618ac..90f6906 100644
--- a/src/recentchanges.hpp
+++ b/src/recentchanges.hpp
@@ -113,7 +113,6 @@ private:
sigc::connection m_current_embedded_name_slot;
sigc::connection m_signal_popover_widgets_changed_cid;
utils::InterruptableTimeout *m_entry_changed_timeout;
- bool m_search_dirty;
Gtk::PopoverMenu *m_window_menu_embedded;
Gtk::PopoverMenu *m_window_menu_default;
utils::GlobalKeybinder m_keybinder;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]