diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-05-18 21:06:20 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-05-18 21:06:20 +0000 |
| commit | 55d2b928c25bbf1279d03560a50a071f9e5d9f5d (patch) | |
| tree | 73fd0bdd4133b7c7f3ad9e8aa1bb51c59f2cc0a6 /gtk/capture_dlg.c | |
| parent | 86ba8937c73843cf0ae3b5c485f7e0e38b142649 (diff) | |
| download | wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.tar.gz wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.tar.bz2 wireshark-55d2b928c25bbf1279d03560a50a071f9e5d9f5d.zip | |
From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
some related upcoming code changes.
- Remove airpcap.h from the repository, since it exists in the AirPcap
devpack (and will be superseded Real Soon Now).
- Show the individual channel flag bits in radiotap.
Fix the 802.11n MCS set display.
This is a partial checkin, so hopefully nothing is broken.
svn path=/trunk/; revision=21831
Diffstat (limited to 'gtk/capture_dlg.c')
| -rw-r--r-- | gtk/capture_dlg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 656340866d..4420dbeab2 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -207,7 +207,7 @@ set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry) /* is it an airpcap interface??? */ /* retrieve the advanced button pointer */ advanced_bt = OBJECT_GET_DATA(entry,AIRPCAP_OPTIONS_ADVANCED_KEY); - airpcap_if_selected = get_airpcap_if_by_name(airpcap_if_list,if_name); + airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list,if_name); airpcap_enable_toolbar_widgets(airpcap_tb,FALSE); if( airpcap_if_selected != NULL) { @@ -582,9 +582,11 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) *m_resolv_cb, *n_resolv_cb, *t_resolv_cb, *bbox, *ok_bt, *cancel_bt, *help_bt; +#if GTK_MAJOR_VERSION >= 2 /* For some reason this button's action crashes under GTK 1. */ #ifdef HAVE_AIRPCAP GtkWidget *advanced_hb, *advanced_bt; #endif +#endif #if GTK_MAJOR_VERSION < 2 GtkAccelGroup *accel_group; #endif @@ -700,7 +702,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) #ifdef HAVE_AIRPCAP /* get the airpcap interface (if it IS an airpcap interface, and update the toolbar... and of course enable the advanced button...)*/ - airpcap_if_selected = get_airpcap_if_by_name(airpcap_if_list,capture_opts->iface); + airpcap_if_selected = get_airpcap_if_from_name(airpcap_if_list,capture_opts->iface); #endif if (capture_opts->iface != NULL) { @@ -872,6 +874,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te); /* advanced row */ +#if GTK_MAJOR_VERSION >= 2 /* For some reason this button's action crashes under GTK 1. */ #ifdef HAVE_AIRPCAP advanced_hb = gtk_hbox_new(FALSE,5); gtk_box_pack_start(GTK_BOX(capture_vb), advanced_hb, FALSE, FALSE, 0); @@ -905,6 +908,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_widget_show(advanced_bt); gtk_widget_show(advanced_hb); #endif +#endif /* Capture file-related options frame */ file_fr = gtk_frame_new("Capture File(s)"); |