From 131f8f0c9a62c6ab01005f02d6265b9c47990cd1 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Thu, 25 Jun 2015 10:45:25 -0700 Subject: Remove g_hash_table_contains from plugin_if The OSX 10.5 build doesn't seem to like it. Change-Id: I7471639f649dbf89ba77d78f77faebbeefcf4ed3 Reviewed-on: https://code.wireshark.org/review/9134 Reviewed-by: Guy Harris Reviewed-by: Evan Huus --- epan/plugin_if.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'epan/plugin_if.c') diff --git a/epan/plugin_if.c b/epan/plugin_if.c index 62244dd4fd..b5e5bf5ee9 100644 --- a/epan/plugin_if.c +++ b/epan/plugin_if.c @@ -189,9 +189,8 @@ static void plugin_if_call_gui_cb(plugin_if_callback_t actionType, GHashTable * if ( g_hash_table_size(plugin_if_callback_functions) != 0 ) { - if ( g_hash_table_contains(plugin_if_callback_functions, key) ) + if ( g_hash_table_lookup_extended(plugin_if_callback_functions, key, NULL, (gpointer*)&action) ) { - action = (plugin_if_gui_cb)g_hash_table_lookup(plugin_if_callback_functions, key); if ( action != NULL ) action(dataSet); } @@ -235,7 +234,7 @@ extern void plugin_if_register_gui_cb(plugin_if_callback_t actionType, plugin_if plugin_if_init_hashtable(); - if ( ! g_hash_table_contains(plugin_if_callback_functions, key ) ) + if ( ! g_hash_table_lookup_extended(plugin_if_callback_functions, key, NULL, NULL ) ) g_hash_table_insert(plugin_if_callback_functions, key, callback); } -- cgit v1.2.1