1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00

Merge branch 'master' into openpgp

This commit is contained in:
James Booth 2015-06-20 00:39:08 +01:00
commit 16999a3964
2 changed files with 19 additions and 0 deletions

View File

@ -204,6 +204,7 @@ static struct cmd_t command_defs[] =
"size : Percentage of the screen taken up by the roster (1-99).",
"add jid [nick] : Add a new item to the roster.",
"remove jid : Removes an item from the roster.",
"empty : Remove all items from roster."
"nick jid nick : Change a contacts nickname.",
"clearnick jid : Removes the current nickname.",
"",
@ -1409,6 +1410,7 @@ cmd_init(void)
autocomplete_add(roster_ac, "nick");
autocomplete_add(roster_ac, "clearnick");
autocomplete_add(roster_ac, "remove");
autocomplete_add(roster_ac, "empty");
autocomplete_add(roster_ac, "show");
autocomplete_add(roster_ac, "hide");
autocomplete_add(roster_ac, "by");

View File

@ -1651,6 +1651,23 @@ cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help)
}
return TRUE;
} else if (strcmp(args[0], "empty") == 0) {
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
GSList *all = roster_get_contacts();
GSList *curr = all;
while (curr) {
PContact contact = curr->data;
roster_send_remove(p_contact_barejid(contact));
curr = g_slist_next(curr);
}
g_slist_free(all);
return TRUE;
// change nickname
} else if (strcmp(args[0], "nick") == 0) {
if (conn_status != JABBER_CONNECTED) {