devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth
2015-02-23 00:50:58 +00:00
parent 95e7bd5a84 2f4d66ea6e
commit 7454bede8b
11 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/console.c
View File

@@ -723,7 +723,7 @@ cons_show_account(ProfAccount *account)
if (curr != NULL) {
win_save_println(console, "Resources:");
// sort in order of availabiltiy
// sort in order of availability
while (curr != NULL) {
Resource *resource = curr->data;
ordered_resources = g_list_insert_sorted(ordered_resources,

8
src/ui/core.c
View File

@@ -1873,7 +1873,7 @@ ui_room_message(const char * const roomjid, const char * const nick,
if (wins_is_current(window)) {
status_bar_active(num);
// not currenlty on groupchat window
// not currently on groupchat window
} else {
status_bar_new(num);
cons_show_incoming_message(nick, num);
@@ -1957,7 +1957,7 @@ ui_room_requires_config(const char * const roomjid)
if (wins_is_current(window)) {
status_bar_active(num);
// not currenlty on groupchat window
// not currently on groupchat window
} else {
status_bar_new(num);
}
@@ -2098,7 +2098,7 @@ ui_room_subject(const char * const roomjid, const char * const nick, const char
if (wins_is_current(window)) {
status_bar_active(num);
// not currenlty on groupchat window
// not currently on groupchat window
} else {
status_bar_active(num);
}
@@ -2132,7 +2132,7 @@ ui_room_broadcast(const char * const roomjid, const char * const message)
if (wins_is_current(window)) {
status_bar_active(num);
// not currenlty on groupchat window
// not currently on groupchat window
} else {
status_bar_new(num);
}

4
src/ui/statusbar.c
View File

@@ -192,7 +192,7 @@ status_bar_inactive(const int win)
is_new[11] = TRUE;
_mark_new(11);
// still have active winsows
// still have active windows
} else if (g_hash_table_size(remaining_active) != 0) {
is_active[11] = TRUE;
is_new[11] = FALSE;
@@ -241,7 +241,7 @@ status_bar_active(const int win)
_mark_active(11);
}
// visible winsow indicators
// visible window indicators
} else {
is_active[true_win] = TRUE;
is_new[true_win] = FALSE;

2
src/ui/window.c
View File

@@ -722,7 +722,7 @@ win_show_info(ProfWin *window, PContact contact)
if (resources != NULL) {
win_save_print(window, '-', NULL, 0, 0, "", "Resources:");
// sort in order of availabiltiy
// sort in order of availability
GList *curr = resources;
while (curr != NULL) {
Resource *resource = curr->data;