debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Deprecate redundant midori_findbar_find

Browse source
This commit is contained in:
Christian Dywan 2012-03-31 03:36:00 +02:00
parent 79942f24aa
commit b838023289
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/midori-browser.c
View file

@ -2752,14 +2752,14 @@ static void
_action_find_next_activate (GtkAction* action, _action_find_next_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
midori_findbar_find (MIDORI_FINDBAR (browser->find), TRUE); midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, TRUE);
} }
static void static void
_action_find_previous_activate (GtkAction* action, _action_find_previous_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
midori_findbar_find (MIDORI_FINDBAR (browser->find), FALSE); midori_findbar_find_text (MIDORI_FINDBAR (browser->find), NULL, FALSE);
} }
static void static void

23
toolbars/midori-findbar.c
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2008-2010 Christian Dywan <christian@twotoasts.de> Copyright (C) 2008-2012 Christian Dywan <christian@twotoasts.de>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -97,7 +97,7 @@ midori_findbar_find_key_press_event_cb (MidoriFindbar* findbar,
else if (event->keyval == GDK_KEY_Return else if (event->keyval == GDK_KEY_Return
&& (event->state & GDK_SHIFT_MASK)) && (event->state & GDK_SHIFT_MASK))
{ {
midori_findbar_find (findbar, FALSE); midori_findbar_find_text (findbar, NULL, FALSE);
return TRUE; return TRUE;
} }
@ -141,6 +141,9 @@ midori_findbar_find_text (MidoriFindbar* findbar,
if (!(view = midori_browser_get_current_tab (browser))) if (!(view = midori_browser_get_current_tab (browser)))
return; return;
if (text == NULL)
text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
case_sensitive = midori_findbar_case_sensitive (findbar); case_sensitive = midori_findbar_case_sensitive (findbar);
midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward);
} }
@ -161,12 +164,20 @@ midori_findbar_get_text (MidoriFindbar* findbar)
return gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); return gtk_entry_get_text (GTK_ENTRY (findbar->find_text));
} }
/**
* midori_findbar_find:
* @findbar: #MidoriFindbar
* @forward: %TRUE to search forward
*
* Advance to the next match.
*
* Deprecated: 0.4.5: Use midori_findbar_find_text() instead.
**/
void void
midori_findbar_find (MidoriFindbar* findbar, midori_findbar_find (MidoriFindbar* findbar,
gboolean forward) gboolean forward)
{ {
const gchar* text = gtk_entry_get_text (GTK_ENTRY (findbar->find_text)); midori_findbar_find_text (findbar, NULL, forward);
midori_findbar_find_text (findbar, text, forward);
} }
void void
@ -195,14 +206,14 @@ static void
midori_findbar_next_activate_cb (GtkWidget* entry, midori_findbar_next_activate_cb (GtkWidget* entry,
MidoriFindbar* findbar) MidoriFindbar* findbar)
{ {
midori_findbar_find (findbar, TRUE); midori_findbar_find_text (findbar, NULL, TRUE);
} }
static void static void
midori_findbar_previous_clicked_cb (GtkWidget* entry, midori_findbar_previous_clicked_cb (GtkWidget* entry,
MidoriFindbar* findbar) MidoriFindbar* findbar)
{ {
midori_findbar_find (findbar, FALSE); midori_findbar_find_text (findbar, NULL, FALSE);
} }
static void static void