summaryrefslogtreecommitdiff
path: root/epan/plugin_if.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2015-06-25 10:45:25 -0700
committerEvan Huus <eapache@gmail.com>2015-06-25 18:12:02 +0000
commit131f8f0c9a62c6ab01005f02d6265b9c47990cd1 (patch)
tree4c16c10abc72a3f60bd167aecbe1c367871319e4 /epan/plugin_if.c
parente4f88dd6cb8b81a2a08ba2ab302968e68f83a0c2 (diff)
downloadwireshark-131f8f0c9a62c6ab01005f02d6265b9c47990cd1.tar.gz
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 <guy@alum.mit.edu> Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/plugin_if.c')
-rw-r--r--epan/plugin_if.c5
1 files changed, 2 insertions, 3 deletions
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);
}