diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-05-13 16:14:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-05-13 16:14:28 +0000 |
| commit | 0a069bc6a3b723a404ded41344cbeb821f0ab1e4 (patch) | |
| tree | 76f426895a261df1fc2c9e39de2748921e9318ec /gtk/capture_dlg.c | |
| parent | 95be22667a06272bad442de862bb8c3ab47b34e7 (diff) | |
Migrate the Airpcap UI code from GtkCombos (deprecated) to GtkComboBoxes.
Consolidate some common code. Rename a bunch of variables. Remove some
unused code.
Fix an offset flag bug in airpcap_loader.c.
This had to be merged by hand with r28349. Hopefully none of those
changes were clobbered.
svn path=/trunk/; revision=28350
Diffstat (limited to 'gtk/capture_dlg.c')
| -rw-r--r-- | gtk/capture_dlg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index f725fc71d6..31673e0119 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1466,7 +1466,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) *help_bt; #ifdef HAVE_AIRPCAP GtkWidget *advanced_bt; - GtkWidget *decryption_cm; + GtkWidget *decryption_cb; #endif #ifdef HAVE_PCAP_REMOTE GtkWidget *iftype_cb; @@ -1555,8 +1555,8 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) /* load the airpcap interfaces */ airpcap_if_list = get_airpcap_interface_list(&err, &err_str); - decryption_cm = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY); - update_decryption_mode_list(decryption_cm); + decryption_cb = g_object_get_data(G_OBJECT(airpcap_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY); + update_decryption_mode_list(decryption_cb); if (airpcap_if_list == NULL && err == CANT_GET_AIRPCAP_INTERFACE_LIST) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str); |