1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into winbuffers

This commit is contained in:
James Booth 2014-07-08 20:02:34 +01:00
commit 82d8d81dfb
2 changed files with 62 additions and 2 deletions

58
profrc.example Normal file
View File

@ -0,0 +1,58 @@
[ui]
splash=true
intype=true
beep=false
statuses.muc=all
theme=boothj5
history=true
titlebar=true
mouse=false
flash=false
vercheck=false
statuses.console=all
statuses.chat=all
[connection]
autoping=60
reconnect=5
account=me@server.org
[chatstates]
enabled=true
outtype=false
gone=10
[notifications]
remind=60
invite=true
sub=true
message=true
room=mention
message.current=true
room.current=true
typing=true
typing.current=false
message.text=true
room.text=true
[alias]
friends=/who online friends
bob=/msg bob@server.org hey wassup?
[logging]
chlog=true
grlog=true
maxsize=1048580
rotate=true
shared=true
[otr]
warn=true
log=redact
policy=manual
[presence]
autoaway.mode=away
autoaway.time=15
autoaway.message=Away from computer
autoaway.check=true

View File

@ -111,8 +111,9 @@ wins_get_next(void)
// if there is a next window return it
curr = g_list_next(curr);
if (curr != NULL) {
int next = GPOINTER_TO_INT(curr->data);
g_list_free(keys);
return wins_get_by_num(GPOINTER_TO_INT(curr->data));
return wins_get_by_num(next);
// otherwise return the first window (console)
} else {
g_list_free(keys);
@ -139,8 +140,9 @@ wins_get_previous(void)
// if there is a previous window return it
curr = g_list_previous(curr);
if (curr != NULL) {
int previous = GPOINTER_TO_INT(curr->data);
g_list_free(keys);
return wins_get_by_num(GPOINTER_TO_INT(curr->data));
return wins_get_by_num(previous);
// otherwise return the last window
} else {
int new_num = GPOINTER_TO_INT(g_list_last(keys)->data);