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 branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2016-07-18 22:52:58 +01:00
commit 920de9b83b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/cmd_funcs.c
View File

@ -6059,13 +6059,14 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args)
return TRUE;
}
char *plugin_name = basename(filename);
gchar *plugin_name = g_path_get_basename(filename);
gboolean result = plugins_install(plugin_name, filename);
if (result) {
cons_show("Plugin installed: %s", plugin_name);
} else {
cons_show("Failed to install plugin: %s", plugin_name);
}
g_free(plugin_name);
return TRUE;
} else if (g_strcmp0(args[0], "load") == 0) {

4
src/xmpp/capabilities.c
View File

@ -87,8 +87,8 @@ caps_init(void)
g_key_file_load_from_file(cache, cache_loc, G_KEY_FILE_KEEP_COMMENTS,
NULL);
jid_to_ver = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
jid_to_caps = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)caps_destroy);
jid_to_ver = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
jid_to_caps = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)caps_destroy);
my_sha1 = NULL;
}