diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-25 11:55:32 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-25 18:56:15 +0000 |
| commit | 78e71f6f5adf2605b21a5db1188c98a96171387a (patch) | |
| tree | 7c5346be114314f61988d4856d7466af36c5b246 /ui | |
| parent | cb0ee6447b5c42144a8266e3dff30b42c6ab0bdf (diff) | |
Remove the other g_hash_table_contains
Missed a bunch of them in g131f8f0.
Change-Id: I5b1df810a31c26c3ab3cd778f8774519283217c8
Reviewed-on: https://code.wireshark.org/review/9143
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/packet_list.c | 13 | ||||
| -rw-r--r-- | ui/qt/main_window.cpp | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 57ab4f95bb..06e8364c75 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -1739,14 +1739,13 @@ void plugin_if_pktlist_preference(gconstpointer user_data) if ( packetlist != NULL && user_data != NULL ) { GHashTable * dataSet = (GHashTable *) user_data; - if ( g_hash_table_contains(dataSet, "pref_module" ) && - g_hash_table_contains(dataSet, "pref_value" ) && - g_hash_table_contains(dataSet, "pref_value" ) ) + const char * module_name; + const char * pref_name; + const char * pref_value; + if ( g_hash_table_lookup_extended(dataSet, "pref_module", NULL, (void**)&module_name ) && + g_hash_table_lookup_extended(dataSet, "pref_key", NULL, (void**)&pref_name ) && + g_hash_table_lookup_extended(dataSet, "pref_value", NULL, (void**)&pref_value ) ) { - const char * module_name = (const char *)g_hash_table_lookup(dataSet, "pref_module"); - const char * pref_name = (const char *)g_hash_table_lookup(dataSet, "pref_key"); - const char * pref_value = (const char *)g_hash_table_lookup(dataSet, "pref_value"); - if ( prefs_store_ext(module_name, pref_name, pref_value) ) packet_list_recreate(); diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 46f372fd17..7af4370ac1 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -90,7 +90,7 @@ void plugin_if_mainwindow_apply_filter(gconstpointer user_data) { GHashTable * dataSet = (GHashTable *) user_data; - if ( g_hash_table_contains(dataSet, "filter_string" ) ) + if ( g_hash_table_lookup_extended(dataSet, "filter_string", NULL, NULL ) ) { QString filter((const char *)g_hash_table_lookup(dataSet, "filter_string")); gbl_cur_main_window_->filterPackets(filter); @@ -103,14 +103,13 @@ void plugin_if_mainwindow_preference(gconstpointer user_data) if ( gbl_cur_main_window_ != NULL && user_data != NULL ) { GHashTable * dataSet = (GHashTable *) user_data; - if ( g_hash_table_contains(dataSet, "pref_module" ) && - g_hash_table_contains(dataSet, "pref_value" ) && - g_hash_table_contains(dataSet, "pref_value" ) ) + const char * module_name; + const char * pref_name; + const char * pref_value; + if ( g_hash_table_lookup_extended(dataSet, "pref_module", NULL, (void**)&module_name ) && + g_hash_table_lookup_extended(dataSet, "pref_key", NULL, (void**)&pref_name ) && + g_hash_table_lookup_extended(dataSet, "pref_value", NULL, (void**)&pref_value ) ) { - const char * module_name = (const char *)g_hash_table_lookup(dataSet, "pref_module"); - const char * pref_name = (const char *)g_hash_table_lookup(dataSet, "pref_key"); - const char * pref_value = (const char *)g_hash_table_lookup(dataSet, "pref_value"); - if ( prefs_store_ext(module_name, pref_name, pref_value) ) { wsApp->emitAppSignal(WiresharkApplication::PacketDissectionChanged); |