Skip to content

Commit

Permalink
squash
Browse files Browse the repository at this point in the history
  • Loading branch information
dadukhin committed Dec 5, 2020
1 parent 9c21327 commit dcb2157
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
7 changes: 3 additions & 4 deletions guake/boxes.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ def on_search_entry_keypress(self, widget, event):
self.search_prev = True

def reset_term_search(self, term):
term.search_set_gregex(GLib.Regex("", 0, 0), 0)
term.search_set_regex(None, 0)
term.search_find_next()

def set_search(self, widget):
Expand All @@ -381,9 +381,8 @@ def set_search(self, widget):

# Set search regex on term
self.searchstring = text
self.searchre = GLib.Regex(text, 0, 0)
term.search_set_gregex(self.searchre, 0)

self.searchre = Vte.Regex.new_for_search(text, -1, Vte.REGEX_FLAGS_DEFAULT)
term.search_set_regex(self.searchre, 0)
self.do_search(None)

def do_search(self, widget):
Expand Down
2 changes: 1 addition & 1 deletion guake/guake_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ def show_hide(self, *args):
self.set_terminal_focus()
return

should_refocus = self.settings.general.get_boolean("window-refocus")
should_refocus = self.settings.general.get_boolean('window-refocus')
has_focus = self.window.get_window().get_state() & Gdk.WindowState.FOCUSED
if should_refocus and not has_focus:
log.info("Refocussing the terminal")
Expand Down
3 changes: 3 additions & 0 deletions releasenotes/notes/fix_search_vte0.46-b92145bc1e572521.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fixes:
- |
Update search box to work with updated regex vte apis for v0.46+, #1752

0 comments on commit dcb2157

Please sign in to comment.