diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/cmd_ac.c | 16 | ||||
| -rw-r--r-- | src/command/cmd_defs.c | 2 | ||||
| -rw-r--r-- | src/event/server_events.c | 2 | ||||
| -rw-r--r-- | src/log.c | 2 | ||||
| -rw-r--r-- | src/ui/console.c | 2 | ||||
| -rw-r--r-- | src/ui/mucwin.c | 2 | ||||
| -rw-r--r-- | src/ui/notifier.c | 2 | ||||
| -rw-r--r-- | src/xmpp/vcard.c | 2 |
8 files changed, 23 insertions, 7 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 0fc8f224..8654a07b 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -101,6 +101,7 @@ static char* _wintitle_autocomplete(ProfWin* window, const char* const input, gb static char* _inpblock_autocomplete(ProfWin* window, const char* const input, gboolean previous); static char* _time_autocomplete(ProfWin* window, const char* const input, gboolean previous); static char* _receipts_autocomplete(ProfWin* window, const char* const input, gboolean previous); +static char* _reconnect_autocomplete(ProfWin* window, const char* const input, gboolean previous); static char* _help_autocomplete(ProfWin* window, const char* const input, gboolean previous); static char* _wins_autocomplete(ProfWin* window, const char* const input, gboolean previous); static char* _tls_autocomplete(ProfWin* window, const char* const input, gboolean previous); @@ -232,6 +233,7 @@ static Autocomplete time_format_ac; static Autocomplete resource_ac; static Autocomplete inpblock_ac; static Autocomplete receipts_ac; +static Autocomplete reconnect_ac; #ifdef HAVE_LIBGPGME static Autocomplete pgp_ac; static Autocomplete pgp_log_ac; @@ -886,6 +888,9 @@ cmd_ac_init(void) autocomplete_add(receipts_ac, "send"); autocomplete_add(receipts_ac, "request"); + reconnect_ac = autocomplete_new(); + autocomplete_add(reconnect_ac, "now"); + #ifdef HAVE_LIBGPGME pgp_ac = autocomplete_new(); autocomplete_add(pgp_ac, "keys"); @@ -1573,6 +1578,7 @@ cmd_ac_reset(ProfWin* window) autocomplete_reset(resource_ac); autocomplete_reset(inpblock_ac); autocomplete_reset(receipts_ac); + autocomplete_reset(reconnect_ac); #ifdef HAVE_LIBGPGME autocomplete_reset(pgp_ac); autocomplete_reset(pgp_log_ac); @@ -1752,6 +1758,7 @@ cmd_ac_uninit(void) autocomplete_free(resource_ac); autocomplete_free(inpblock_ac); autocomplete_free(receipts_ac); + autocomplete_free(reconnect_ac); #ifdef HAVE_LIBGPGME autocomplete_free(pgp_ac); autocomplete_free(pgp_log_ac); @@ -2048,6 +2055,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ g_hash_table_insert(ac_funcs, "/inpblock", _inpblock_autocomplete); g_hash_table_insert(ac_funcs, "/time", _time_autocomplete); g_hash_table_insert(ac_funcs, "/receipts", _receipts_autocomplete); + g_hash_table_insert(ac_funcs, "/reconnect", _reconnect_autocomplete); g_hash_table_insert(ac_funcs, "/wins", _wins_autocomplete); g_hash_table_insert(ac_funcs, "/tls", _tls_autocomplete); g_hash_table_insert(ac_funcs, "/titlebar", _titlebar_autocomplete); @@ -3551,6 +3559,14 @@ _receipts_autocomplete(ProfWin* window, const char* const input, gboolean previo } static char* +_reconnect_autocomplete(ProfWin* window, const char* const input, gboolean previous) +{ + char* result = NULL; + result = autocomplete_param_with_ac(input, "/reconnect", reconnect_ac, TRUE, previous); + return result; +} + +static char* _alias_autocomplete(ProfWin* window, const char* const input, gboolean previous) { char* result = NULL; diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index c4d2df4a..d204db3b 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -1126,7 +1126,7 @@ static const struct cmd_t command_defs[] = { { "chat none", "Do not show any new chat messages in the console window." }, { "muc all", "Indicate all new chat room messages in the console." }, { "muc first", "Indicate only the first new message in each room in the console." }, - { "muc mention", "Indicate only messages in which you have beeen mentioned in the console." }, + { "muc mention", "Indicate only messages in which you have been mentioned in the console." }, { "muc none", "Do not show any new chat room messages in the console window." }, { "private all", "Indicate all new private room messages in the console." }, { "private first", "Indicate only the first private room message in the console." }, diff --git a/src/event/server_events.c b/src/event/server_events.c index eb3e96e7..c1f11332 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -160,7 +160,7 @@ sv_ev_roster_received(void) // Redraw the screen after entry of the PGP secret key, but not init ProfWin* win = wins_get_current(); char* theme = prefs_get_string(PREF_THEME); - win_clear(win); + win_redraw(win); theme_init(theme); g_free(theme); ui_resize(); diff --git a/src/log.c b/src/log.c index a1b7bb1d..f2537675 100644 --- a/src/log.c +++ b/src/log.c @@ -105,7 +105,7 @@ _rotate_log_file(void) log_info("Log has been rotated"); } -// abbreviation string is the prefix thats used in the log file +// abbreviation string is the prefix that's used in the log file static char* _log_abbreviation_string_from_level(log_level_t level) { diff --git a/src/ui/console.c b/src/ui/console.c index 270c5943..f34f6f03 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -810,7 +810,7 @@ cons_show_disco_info(const char* jid, GSList* identities, GSList* features) cons_show(" Identities"); } while (identities) { - DiscoIdentity* identity = identities->data; // anme trpe, cat + DiscoIdentity* identity = identities->data; // name type, category GString* identity_str = g_string_new(" "); if (identity->name) { identity_str = g_string_append(identity_str, identity->name); diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c index a4bcc191..550b05e2 100644 --- a/src/ui/mucwin.c +++ b/src/ui/mucwin.c @@ -196,7 +196,7 @@ mucwin_room_disco_info(ProfMucWin* mucwin, GSList* identities, GSList* features) win_println(window, THEME_DEFAULT, "!", "Identities:"); } while (identities) { - DiscoIdentity* identity = identities->data; // anme trpe, cat + DiscoIdentity* identity = identities->data; // name, type, category GString* identity_str = g_string_new(" "); if (identity->name) { identity_str = g_string_append(identity_str, identity->name); diff --git a/src/ui/notifier.c b/src/ui/notifier.c index 92ebf835..07a542af 100644 --- a/src/ui/notifier.c +++ b/src/ui/notifier.c @@ -291,7 +291,7 @@ notify(const char* const message, int timeout, const char* const category) int res = system(notify_command->str); if (res == -1) { - log_error("Could not send desktop notificaion."); + log_error("Could not send desktop notification."); } g_string_free(notify_command, TRUE); diff --git a/src/xmpp/vcard.c b/src/xmpp/vcard.c index 6d2f0b1e..b3ff5d39 100644 --- a/src/xmpp/vcard.c +++ b/src/xmpp/vcard.c @@ -297,7 +297,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard) element->nickname = stanza_text_strdup(child_pointer); if (!element->nickname) { - // Invaild element, free and do not push + // Invalid element, free and do not push free(element); continue; } |