mirror of
https://github.com/irssi/irssi.git
synced 2026-08-20 17:12:51 +02:00
s/newline/new_line/ - AIX curses (or something) seems to use #define
newline for something git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1528 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
3d370cd3e0
commit
62aa12c411
1 changed files with 4 additions and 4 deletions
|
|
@ -841,7 +841,7 @@ static void bookmark_check_remove(char *key, LINE_REC *line,
|
||||||
static void view_bookmarks_check(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
|
static void view_bookmarks_check(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
|
||||||
{
|
{
|
||||||
BOOKMARK_FIND_REC rec;
|
BOOKMARK_FIND_REC rec;
|
||||||
LINE_REC *newline;
|
LINE_REC *new_line;
|
||||||
GSList *tmp;
|
GSList *tmp;
|
||||||
|
|
||||||
rec.remove_line = line;
|
rec.remove_line = line;
|
||||||
|
|
@ -852,14 +852,14 @@ static void view_bookmarks_check(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
|
||||||
if (rec.remove_list != NULL) {
|
if (rec.remove_list != NULL) {
|
||||||
GList *pos = g_list_find(view->buffer->lines, line);
|
GList *pos = g_list_find(view->buffer->lines, line);
|
||||||
|
|
||||||
newline = pos == NULL || pos->prev == NULL ? NULL :
|
new_line = pos == NULL || pos->prev == NULL ? NULL :
|
||||||
(pos->next == NULL ? pos->prev->data :
|
(pos->next == NULL ? pos->prev->data :
|
||||||
pos->next->data);
|
pos->next->data);
|
||||||
for (tmp = rec.remove_list; tmp != NULL; tmp = tmp->next) {
|
for (tmp = rec.remove_list; tmp != NULL; tmp = tmp->next) {
|
||||||
g_hash_table_remove(view->bookmarks, tmp->data);
|
g_hash_table_remove(view->bookmarks, tmp->data);
|
||||||
if (newline != NULL) {
|
if (new_line != NULL) {
|
||||||
g_hash_table_insert(view->bookmarks,
|
g_hash_table_insert(view->bookmarks,
|
||||||
tmp->data, newline);
|
tmp->data, new_line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
g_slist_free(rec.remove_list);
|
g_slist_free(rec.remove_list);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue