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-01 20:47:28 +00:00
parent 702ea0b5f3 5b26879e31
commit 372cf822cb
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/command.c
View File

@@ -615,7 +615,7 @@ static struct cmd_t command_defs[] =
{ "/wrap on|off", "Word wrapping.",
{ "/wrap on|off",
"------------",
"Enable or disable word wrapping.",
"Enable or disable word wrapping in the main window.",
NULL } } },
{ "/time",
@@ -1141,7 +1141,7 @@ cmd_init(void)
autocomplete_add(help_ac, "basic");
autocomplete_add(help_ac, "chatting");
autocomplete_add(help_ac, "groupchat");
autocomplete_add(help_ac, "presence");
autocomplete_add(help_ac, "presences");
autocomplete_add(help_ac, "contacts");
autocomplete_add(help_ac, "service");
autocomplete_add(help_ac, "settings");

6
src/command/commands.c
View File

@@ -154,6 +154,10 @@ cmd_connect(gchar **args, struct cmd_help_t help)
cons_show("Error evaluating password, see logs for details.");
return TRUE;
}
// strip trailing newline
if (g_str_has_suffix(account->password, "\n")) {
account->password[strlen(account->password)-1] = '\0';
}
} else {
log_error("popen failed when running eval_password.");
cons_show("Error evaluating password, see logs for details.");
@@ -710,7 +714,7 @@ cmd_help(gchar **args, struct cmd_help_t help)
"/rooms", "/tiny", "/who", "/nick", "/privileges", "/info", "/occupants" };
_cmd_show_filtered_help("Groupchat commands", filter, ARRAY_SIZE(filter));
} else if (strcmp(args[0], "presence") == 0) {
} else if (strcmp(args[0], "presences") == 0) {
gchar *filter[] = { "/autoaway", "/away", "/chat", "/dnd",
"/online", "/priority", "/account", "/status", "/statuses", "/who",
"/xa" };