aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2002-05-18 02:41:46 +0000
committerGerald Combs <gerald@wireshark.org>2002-05-18 02:41:46 +0000
commit0bc4c2d329947de1add8267a2a03ef002e760785 (patch)
treee83211cde507185297678fab78231f6e21cec7b7 /gtk
parent8682b694f1f6c8046e96b90015811dce3ba52ab4 (diff)
downloadwireshark-0bc4c2d329947de1add8267a2a03ef002e760785.tar.gz
wireshark-0bc4c2d329947de1add8267a2a03ef002e760785.tar.bz2
wireshark-0bc4c2d329947de1add8267a2a03ef002e760785.zip
In the Windows capture dialog, place the interface description before the
interface name. svn path=/trunk/; revision=5499
Diffstat (limited to 'gtk')
-rw-r--r--gtk/capture_dlg.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index c19b2107bc..6adae75f4c 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1,7 +1,7 @@
/* capture_dlg.c
* Routines for packet capture windows
*
- * $Id: capture_dlg.c,v 1.67 2002/04/14 20:06:04 gerald Exp $
+ * $Id: capture_dlg.c,v 1.68 2002/05/18 02:41:46 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -695,7 +695,13 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
if_text =
g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
- if_name = strtok(if_text, " \t");
+ /* Windows combo entries have a description followed by the interface name */
+ if_name = strrchr(if_text, ' ');
+ if (if_name == NULL) {
+ if_name = if_text;
+ } else {
+ if_name++;
+ }
if (if_name == NULL) {
simple_dialog(ESD_TYPE_CRIT, NULL,
"You didn't specify an interface on which to capture packets.");