1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into configure

This commit is contained in:
James Booth 2016-10-09 23:48:21 +01:00
commit 6059af6976

View File

@ -200,7 +200,6 @@ callbacks_add_timed(const char *const plugin_name, PluginTimedFunction *timed_fu
GList *timed_function_list = g_hash_table_lookup(p_timed_functions, plugin_name); GList *timed_function_list = g_hash_table_lookup(p_timed_functions, plugin_name);
if (timed_function_list) { if (timed_function_list) {
timed_function_list = g_list_append(timed_function_list, timed_function); timed_function_list = g_list_append(timed_function_list, timed_function);
g_hash_table_replace(p_timed_functions, strdup(plugin_name), timed_function_list);
} else { } else {
timed_function_list = g_list_append(timed_function_list, timed_function); timed_function_list = g_list_append(timed_function_list, timed_function);
g_hash_table_insert(p_timed_functions, strdup(plugin_name), timed_function_list); g_hash_table_insert(p_timed_functions, strdup(plugin_name), timed_function_list);
@ -230,7 +229,6 @@ callbacks_remove_win(const char *const plugin_name, const char *const tag)
} }
} }
void void
callbacks_add_window_handler(const char *const plugin_name, const char *tag, PluginWindowCallback *window_callback) callbacks_add_window_handler(const char *const plugin_name, const char *tag, PluginWindowCallback *window_callback)
{ {