osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix GTK warning in EXTCAP parts 

Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759
Reviewed-on: https://code.wireshark.org/review/5628
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
This commit is contained in:
Irene Ruengeler 2014-12-05 10:04:29 +01:00 committed by Irene Ruengeler
parent 301a5b7cea
commit e5757d1dcc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/gtk/capture_dlg.c
View File

@ -2392,7 +2392,7 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
GtkWidget *buffer_size_sb;
#endif
#ifdef HAVE_EXTCAP
GtkWidget *extcap_vbox;
GtkWidget *extcap_vbox = NULL;
#endif
interface_t device;
@ -2457,7 +2457,8 @@ save_options_cb(GtkWidget *win _U_, gpointer user_data _U_)
if (device.external_cap_args_settings != NULL)
g_hash_table_unref(device.external_cap_args_settings);
device.external_cap_args_settings = extcap_gtk_get_state(extcap_vbox);
if (extcap_vbox != NULL)
device.external_cap_args_settings = extcap_gtk_get_state(extcap_vbox);
/* Destroy the args data linked in the gtk widget */
#if 0
@ -2980,8 +2981,10 @@ void options_interface_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColum
#ifdef HAVE_EXTCAP
extcap_hash = device.external_cap_args_settings;
extcap_vbox = build_extcap_options(device.name, extcap_hash);
gtk_box_pack_start(GTK_BOX(capture_vb), extcap_vbox, FALSE, FALSE, 5);
gtk_widget_show(extcap_vbox);
if (extcap_vbox != NULL) {
gtk_box_pack_start(GTK_BOX(capture_vb), extcap_vbox, FALSE, FALSE, 5);
gtk_widget_show(extcap_vbox);
}
g_object_set_data(G_OBJECT(opt_edit_w), E_CAP_EXTCAP_KEY, extcap_vbox);
#endif