diff options
| author | Irene Ruengeler <ruengeler@wireshark.org> | 2014-12-05 10:04:29 +0100 |
|---|---|---|
| committer | Irene Ruengeler <iruengeler@googlemail.com> | 2014-12-09 07:18:06 +0000 |
| commit | e5757d1dccbf693756003a62ea8fc1a38b17d1ca (patch) | |
| tree | 4b3d76452600eb73b221443e545c6fe53b55454e /ui/gtk/capture_dlg.c | |
| parent | 301a5b7ceac60d0569ce1717e839241d10724003 (diff) | |
| download | wireshark-e5757d1dccbf693756003a62ea8fc1a38b17d1ca.tar.gz | |
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>
Diffstat (limited to 'ui/gtk/capture_dlg.c')
| -rw-r--r-- | ui/gtk/capture_dlg.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 535334abac..17fafa3167 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -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 |