diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/command.c | 8 | ||||
| -rw-r--r-- | src/command/commands.c | 10 | ||||
| -rw-r--r-- | src/config/theme.c | 1 | ||||
| -rw-r--r-- | src/profanity.c | 4 | ||||
| -rw-r--r-- | src/roster_list.c | 2 | ||||
| -rw-r--r-- | src/roster_list.h | 2 |
6 files changed, 16 insertions, 11 deletions
diff --git a/src/command/command.c b/src/command/command.c index 6d026103..6c52af2a 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -169,12 +169,12 @@ static struct cmd_t command_defs[] = { "/roster", cmd_roster, parse_args_with_freetext, 0, 3, NULL, - { "/roster [nooffline|show|hide|by|size|add|remove|nick|clearnick] [offline|resource] [percent] [group|presence|none] [jid] [nickname]", "Manage your roster.", - { "/roster [nooffline|show|hide|by|size|add|remove|nick|clearnick] [offline|resource] [percent] [group|presence|none] [jid] [nickname]", + { "/roster [online|show|hide|by|size|add|remove|nick|clearnick] [offline|resource] [percent] [group|presence|none] [jid] [nickname]", "Manage your roster.", + { "/roster [online|show|hide|by|size|add|remove|nick|clearnick] [offline|resource] [percent] [group|presence|none] [jid] [nickname]", "-------------------------------------------------------------------------------------------------------------------------", "View, add to, and remove from your roster.", "Passing no arguments lists all contacts in your roster.", - "nooffline - List all contacts in your roster without the clutter of offline contacts.", + "online - Show all online contacts in your roster.", "show - Show the roster panel in the console window.", "hide - Hide the roster panel.", "show offline - Show offline contacts in the roster panel.", @@ -1253,7 +1253,7 @@ cmd_init(void) roster_ac = autocomplete_new(); autocomplete_add(roster_ac, "add"); - autocomplete_add(roster_ac, "nooffline"); + autocomplete_add(roster_ac, "online"); autocomplete_add(roster_ac, "nick"); autocomplete_add(roster_ac, "clearnick"); autocomplete_add(roster_ac, "remove"); diff --git a/src/command/commands.c b/src/command/commands.c index 58425358..fc95f521 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1083,6 +1083,8 @@ _who_roster(gchar **args, struct cmd_help_t help) } } } + + g_slist_free(list); } gboolean @@ -1356,12 +1358,14 @@ cmd_roster(gchar **args, struct cmd_help_t help) if (args[0] == NULL) { GSList *list = roster_get_contacts(); cons_show_roster(list); + g_slist_free(list); return TRUE; - // show roster, no offline contacts - } else if(g_strcmp0(args[0], "nooffline") == 0){ - GSList *list = roster_get_contacts_nooffline(); + // show roster, only online contacts + } else if(g_strcmp0(args[0], "online") == 0){ + GSList *list = roster_get_contacts_online(); cons_show_roster(list); + g_slist_free(list); return TRUE; // set roster size diff --git a/src/config/theme.c b/src/config/theme.c index 714560dd..72d5ef0b 100644 --- a/src/config/theme.c +++ b/src/config/theme.c @@ -390,6 +390,7 @@ _set_string_preference(char *prefstr, preference_t pref) if (g_key_file_has_key(theme, "ui", prefstr, NULL)) { gchar *val = g_key_file_get_string(theme, "ui", prefstr, NULL); prefs_set_string(pref, val); + g_free(val); } } diff --git a/src/profanity.c b/src/profanity.c index 64d3eca4..2514bc50 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -114,14 +114,14 @@ prof_run(const int disable_tls, char *log_level, char *account_name) g_timer_start(timer); } + ch = ui_get_char(inp, &size, &result); + ui_handle_special_keys(&ch, result); #ifdef HAVE_LIBOTR otr_poll(); #endif jabber_process_events(); ui_update(); - - ch = ui_get_char(inp, &size, &result); } inp[size++] = '\0'; diff --git a/src/roster_list.c b/src/roster_list.c index ca777033..2d01d205 100644 --- a/src/roster_list.c +++ b/src/roster_list.c @@ -308,7 +308,7 @@ roster_get_contacts(void) } GSList * -roster_get_contacts_nooffline(void) +roster_get_contacts_online(void) { GSList *result = NULL; GHashTableIter iter; diff --git a/src/roster_list.h b/src/roster_list.h index c3ef44cb..7743ece6 100644 --- a/src/roster_list.h +++ b/src/roster_list.h @@ -57,7 +57,7 @@ gboolean roster_add(const char * const barejid, const char * const name, GSList const char * const subscription, gboolean pending_out); char * roster_barejid_from_name(const char * const name); GSList * roster_get_contacts(void); -GSList * roster_get_contacts_nooffline(void); +GSList * roster_get_contacts_online(void); gboolean roster_has_pending_subscriptions(void); char * roster_contact_autocomplete(char *search_str); char * roster_fulljid_autocomplete(char *search_str); |