mirror of
https://github.com/irssi/irssi.git
synced 2026-08-11 04:43:34 +02:00
/LAST didn't work when window's max. number of lines was full + a few
cleanups. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@210 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
ee254bd146
commit
d729474195
2 changed files with 4 additions and 8 deletions
|
|
@ -613,13 +613,10 @@ GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, i
|
|||
g_return_val_if_fail(window != NULL, NULL);
|
||||
g_return_val_if_fail(text != NULL, NULL);
|
||||
|
||||
text = g_strdup(text); g_strup(text);
|
||||
matches = NULL; size = 1024; str = g_malloc(1024);
|
||||
|
||||
if (regcomp(&preg, text, REG_EXTENDED|REG_NOSUB) != 0) {
|
||||
g_free(text);
|
||||
if (regcomp(&preg, text, REG_ICASE|REG_EXTENDED|REG_NOSUB) != 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (startline == NULL) startline = WINDOW_GUI(window)->lines;
|
||||
for (tmp = startline; tmp != NULL; tmp = tmp->next)
|
||||
|
|
@ -656,9 +653,9 @@ GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, i
|
|||
}
|
||||
str[n] = '\0';
|
||||
|
||||
if (regexp ? /*regexec(&preg, str, 0, NULL, 0) == 0*/regexp_match(str, text) :
|
||||
if (regexp ? regexec(&preg, str, 0, NULL, 0) == 0 :
|
||||
fullword ? stristr_full(str, text) != NULL :
|
||||
strstr(str, text) != NULL) {
|
||||
stristr(str, text) != NULL) {
|
||||
/* matched */
|
||||
matches = g_list_append(matches, rec);
|
||||
}
|
||||
|
|
@ -666,7 +663,6 @@ GList *gui_window_find_text(WINDOW_REC *window, gchar *text, GList *startline, i
|
|||
regfree(&preg);
|
||||
|
||||
if (str != NULL) g_free(str);
|
||||
g_free(text);
|
||||
return matches;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue