aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge remote-tracking branch 'savar/fix_fix_memory_leak'

Browse Source
This commit is contained in:
James Booth 2015-01-14 13:37:23 +00:00
commit b5d4a52dfa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/commands.c
View File

@ -93,7 +93,6 @@ cmd_connect(gchar **args, struct cmd_help_t help)
} else { } else {
gchar *opt_keys[] = { "server", "port", NULL }; gchar *opt_keys[] = { "server", "port", NULL };
gboolean parsed; gboolean parsed;
char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
GHashTable *options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed); GHashTable *options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed);
if (!parsed) { if (!parsed) {
@ -115,16 +114,19 @@ cmd_connect(gchar **args, struct cmd_help_t help)
} }
char *user = args[0]; char *user = args[0];
char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT);
if(!user){ if(!user){
if(def){ if(def){
user = def; user = def;
cons_show("Using default account %s.", user); cons_show("Using default account %s.", user);
} else { } else {
cons_show("No default account."); cons_show("No default account.");
g_free(def);
return TRUE; return TRUE;
} }
} }
g_free(def); g_free(def);
def = NULL;
char *lower = g_utf8_strdown(user, -1); char *lower = g_utf8_strdown(user, -1);
char *jid; char *jid;