More warining fixes: char -> const char
[obnox/wireshark/wip.git] / gtk / capture_dlg.c
index 2bf3b9514715dc8b21236b6538f9fb910c947376..85e4022dfb8954f535b050288e811dea76bdad37 100644 (file)
@@ -1,7 +1,7 @@
 /* capture_dlg.c
  * Routines for packet capture windows
  *
- * $Id: capture_dlg.c,v 1.78 2003/05/15 13:38:05 deniel Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 
 #ifdef HAVE_LIBPCAP
 
+#include <pcap.h>
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include <pcap.h>
-
+#include <epan/packet.h>
 #include "capture.h"
 #include "globals.h"
-#include <epan/resolv.h>
+#include <epan/addr_resolv.h>
 #include "main.h"
 #include "ui_util.h"
+#include "capture.h"
 #include "capture_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "pcap-util.h"
-#include "prefs.h"
+#include "capture_ui_utils.h"
+#include <epan/prefs.h>
 #include "ringbuffer.h"
 #include <epan/filesystem.h>
 #include "compat_macros.h"
+#include "file_dlg.h"
+#include "help_dlg.h"
+#include "gtkglobals.h"
+#include "cfilter_combo_utils.h"
 
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #endif
 
 /* Capture callback data keys */
-#define E_CAP_IFACE_KEY       "cap_iface"
-#define E_CAP_SNAP_CB_KEY     "cap_snap_cb"
-#define E_CAP_SNAP_SB_KEY     "cap_snap_sb"
-#define E_CAP_PROMISC_KEY     "cap_promisc"
-#define E_CAP_FILT_KEY        "cap_filter_te"
-#define E_CAP_FILE_TE_KEY     "cap_file_te"
-#define E_CAP_RING_ON_TB_KEY  "cap_ringbuffer_on_tb"
-#define E_CAP_RING_NBF_LB_KEY "cap_ringbuffer_nbf_lb"
-#define E_CAP_RING_NBF_SB_KEY "cap_ringbuffer_nbf_sb"
-#define E_CAP_RING_DURATION_CB_KEY "cap_ringbuffer_duration_cb"
-#define E_CAP_RING_DURATION_SB_KEY "cap_ringbuffer_duration_sb"
-#define E_CAP_SYNC_KEY        "cap_sync"
-#define E_CAP_AUTO_SCROLL_KEY "cap_auto_scroll"
-#define E_CAP_COUNT_CB_KEY    "cap_count_cb"
-#define E_CAP_COUNT_SB_KEY    "cap_count_sb"
-#define E_CAP_FILESIZE_CB_KEY "cap_filesize_cb"
-#define E_CAP_FILESIZE_SB_KEY "cap_filesize_sb"
-#define E_CAP_FILESIZE_LB_KEY "cap_filesize_lb"
-#define E_CAP_DURATION_CB_KEY "cap_duration_cb"
-#define E_CAP_DURATION_SB_KEY "cap_duration_sb"
-#define E_CAP_M_RESOLVE_KEY   "cap_m_resolve"
-#define E_CAP_N_RESOLVE_KEY   "cap_n_resolve"
-#define E_CAP_T_RESOLVE_KEY   "cap_t_resolve"
-
-#define E_FS_CALLER_PTR_KEY       "fs_caller_ptr"
-#define E_FILE_SEL_DIALOG_PTR_KEY "file_sel_dialog_ptr"
+#define E_CAP_IFACE_KEY             "cap_iface"
+#define E_CAP_IFACE_IP_KEY          "cap_iface_ip"
+#define E_CAP_SNAP_CB_KEY           "cap_snap_cb"
+#define E_CAP_LT_OM_KEY             "cap_lt_om"
+#define E_CAP_LT_OM_LABEL_KEY       "cap_lt_om_label"
+#ifdef _WIN32
+#define E_CAP_BUFFER_SIZE_SB_KEY    "cap_buffer_size_sb"
+#endif
+#define E_CAP_SNAP_SB_KEY           "cap_snap_sb"
+#define E_CAP_PROMISC_KEY           "cap_promisc"
+#define E_CAP_FILT_KEY              "cap_filter_te"
+#define E_CAP_FILE_TE_KEY           "cap_file_te"
+#define E_CAP_MULTI_FILES_ON_CB_KEY "cap_multi_files_on_cb"
+#define E_CAP_RING_FILESIZE_CB_KEY  "cap_ring_filesize_cb"
+#define E_CAP_RING_FILESIZE_SB_KEY  "cap_ring_filesize_sb"
+#define E_CAP_RING_FILESIZE_OM_KEY  "cap_ring_filesize_om"
+#define E_CAP_FILE_DURATION_CB_KEY  "cap_file_duration_cb"
+#define E_CAP_FILE_DURATION_SB_KEY  "cap_file_duration_sb"
+#define E_CAP_FILE_DURATION_OM_KEY  "cap_file_duration_om"
+#define E_CAP_RING_NBF_CB_KEY       "cap_ring_nbf_cb"
+#define E_CAP_RING_NBF_SB_KEY       "cap_ring_nbf_sb"
+#define E_CAP_RING_NBF_LB_KEY       "cap_ring_nbf_lb"
+#define E_CAP_STOP_FILES_CB_KEY     "cap_stop_files_cb"
+#define E_CAP_STOP_FILES_SB_KEY     "cap_stop_files_sb"
+#define E_CAP_STOP_FILES_LB_KEY     "cap_stop_files_lb"
+#define E_CAP_SYNC_KEY              "cap_sync"
+#define E_CAP_AUTO_SCROLL_KEY       "cap_auto_scroll"
+#define E_CAP_HIDE_INFO_KEY         "cap_hide_info"
+#define E_CAP_STOP_PACKETS_CB_KEY   "cap_stop_packets_cb"
+#define E_CAP_STOP_PACKETS_SB_KEY   "cap_stop_packets_sb"
+#define E_CAP_STOP_PACKETS_LB_KEY   "cap_stop_packets_lb"
+#define E_CAP_STOP_FILESIZE_CB_KEY  "cap_stop_filesize_cb"
+#define E_CAP_STOP_FILESIZE_SB_KEY  "cap_stop_filesize_sb"
+#define E_CAP_STOP_FILESIZE_OM_KEY  "cap_stop_filesize_om"
+#define E_CAP_STOP_DURATION_CB_KEY  "cap_stop_duration_cb"
+#define E_CAP_STOP_DURATION_SB_KEY  "cap_stop_duration_sb"
+#define E_CAP_STOP_DURATION_OM_KEY  "cap_stop_duration_om"
+#define E_CAP_M_RESOLVE_KEY         "cap_m_resolve"
+#define E_CAP_N_RESOLVE_KEY         "cap_n_resolve"
+#define E_CAP_T_RESOLVE_KEY         "cap_t_resolve"
+
+#define E_CAP_OM_LT_VALUE_KEY       "cap_om_lt_value"
 
-static void
-capture_prep_file_cb(GtkWidget *w, gpointer te);
 
-static void
-cap_prep_fs_ok_cb(GtkWidget *w, gpointer data);
+/*
+ * Keep a static pointer to the current "Capture Options" window, if
+ * any, so that if somebody tries to do "Capture:Start" while there's
+ * already a "Capture Options" window up, we just pop up the existing
+ * one, rather than creating a new one.
+ */
+static GtkWidget *cap_open_w;
+
 
 static void
-cap_prep_fs_cancel_cb(GtkWidget *w, gpointer data);
+capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te);
 
 static void
-cap_prep_fs_destroy_cb(GtkWidget *win, GtkWidget* file_te);
+select_link_type_cb(GtkWidget *w, gpointer data);
 
 static void
 capture_prep_adjust_sensitivity(GtkWidget *tb, gpointer parent_w);
 
 static void
-capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w);
+capture_prep_destroy_cb(GtkWidget *win, gpointer user_data);
 
 static void
-capture_prep_close_cb(GtkWidget *close_bt, gpointer parent_w);
+capture_prep_interface_changed_cb(GtkWidget *entry, gpointer parent_w);
 
 static void
-capture_prep_destroy_cb(GtkWidget *win, gpointer user_data);
+capture_dlg_prep(gpointer parent_w);
 
+
+/* stop the currently running capture */
 void
 capture_stop_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-    capture_stop();
+    capture_stop(capture_opts);
 }
 
-/*
- * Keep a static pointer to the current "Capture Options" window, if
- * any, so that if somebody tries to do "Capture:Start" while there's
- * already a "Capture Options" window up, we just pop up the existing
- * one, rather than creating a new one.
- */
-static GtkWidget *cap_open_w;
+/* restart (stop - delete old file - start) running capture */
+void
+capture_restart_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+    capture_restart(capture_opts);
+}
+
+/* init the link type list */
+/* (often this list has only one entry and will therefore be disabled) */
+static void
+set_link_type_list(GtkWidget *linktype_om, GtkWidget *entry)
+{
+  gchar *entry_text;
+  gchar *if_text;
+  gchar *if_name;
+  GList *if_list;
+  GList *if_entry;
+  if_info_t *if_info;
+  GList *lt_list;
+  int err;
+  char err_buf[PCAP_ERRBUF_SIZE];
+  GtkWidget *lt_menu, *lt_menu_item;
+  GList *lt_entry;
+  data_link_info_t *data_link_info;
+  gchar *linktype_menu_label;
+  guint num_supported_link_types;
+  GtkWidget *linktype_lb = OBJECT_GET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY);
+  GtkWidget *if_ip_lb;
+  GString *ip_str = g_string_new("IP address: ");
+  int ips = 0;
+  GSList *curr_ip;
+  if_addr_t *ip_addr;
+
+  lt_menu = gtk_menu_new();
+  entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+  if_text = g_strstrip(entry_text);
+  if_name = get_if_name(if_text);
+
+  /*
+   * If the interface name is in the list of known interfaces, get
+   * its list of link-layer types and set the option menu to display it.
+   *
+   * If it's not, don't bother - the user might be in the middle of
+   * editing the list, or it might be a remote device in which case
+   * getting the list could take an arbitrarily-long period of time.
+   * The list currently won't contain any remote devices (as
+   * "pcap_findalldevs()" doesn't know about remote devices, and neither
+   * does the code we use if "pcap_findalldevs()" isn't available), but
+   * should contain all the local devices on which you can capture.
+   */
+  lt_list = NULL;
+  if (*if_name != '\0') {
+    /*
+     * Try to get the list of known interfaces.
+     */
+    if_list = get_interface_list(&err, err_buf);
+    if (if_list != NULL) {
+      /*
+       * We have the list - check it.
+       */
+      for (if_entry = if_list; if_entry != NULL;
+          if_entry = g_list_next(if_entry)) {
+       if_info = if_entry->data;
+       if (strcmp(if_info->name, if_name) == 0) {
+         /*
+          * It's in the list.
+          * Get the list of link-layer types for it.
+          */
+         lt_list = get_pcap_linktype_list(if_name, err_buf);
+
+         /* create string of list of IP addresses of this interface */
+         for (; (curr_ip = g_slist_nth(if_info->ip_addr, ips)) != NULL; ips++) {
+           if (ips != 0)
+             g_string_append(ip_str, ", ");
+
+           ip_addr = (if_addr_t *)curr_ip->data;
+           switch (ip_addr->type) {
+
+           case AT_IPv4:
+             g_string_append(ip_str,
+               ip_to_str((guint8 *)&ip_addr->ip_addr.ip4_addr));
+             break;
+
+           case AT_IPv6:
+             g_string_append(ip_str,
+                 ip6_to_str((struct e_in6_addr *)&ip_addr->ip_addr.ip6_addr));
+             break;
+
+            default:
+              g_assert_not_reached();
+           }
+         }
+
+         if (if_info->loopback)
+           g_string_append(ip_str, " (loopback)");
+       }
+      }
+      free_interface_list(if_list);
+    }
+  }
+  g_free(entry_text);
+  num_supported_link_types = 0;
+  for (lt_entry = lt_list; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
+    data_link_info = lt_entry->data;
+    if (data_link_info->description != NULL) {
+      lt_menu_item = gtk_menu_item_new_with_label(data_link_info->description);
+      OBJECT_SET_DATA(lt_menu_item, E_CAP_LT_OM_KEY, linktype_om);
+      SIGNAL_CONNECT(lt_menu_item, "activate", select_link_type_cb,
+                     GINT_TO_POINTER(data_link_info->dlt));
+      num_supported_link_types++;
+    } else {
+      /* Not supported - tell them about it but don't let them select it. */
+      linktype_menu_label = g_strdup_printf("%s (not supported)",
+                                            data_link_info->name);
+      lt_menu_item = gtk_menu_item_new_with_label(linktype_menu_label);
+      g_free(linktype_menu_label);
+      gtk_widget_set_sensitive(lt_menu_item, FALSE);
+    }
+    gtk_menu_append(GTK_MENU(lt_menu), lt_menu_item);
+  }
+  if (lt_list != NULL)
+    free_pcap_linktype_list(lt_list);
+  gtk_option_menu_set_menu(GTK_OPTION_MENU(linktype_om), lt_menu);
+  gtk_widget_set_sensitive(linktype_lb, num_supported_link_types >= 2);
+  gtk_widget_set_sensitive(linktype_om, num_supported_link_types >= 2);
+
+  if_ip_lb = OBJECT_GET_DATA(linktype_om, E_CAP_IFACE_KEY);
+  if(ips == 0) {
+    g_string_append(ip_str, "unknown");
+  }
+  gtk_label_set_text(GTK_LABEL(if_ip_lb), ip_str->str);
+  g_string_free(ip_str, TRUE);
+}
+
+
+#define TIME_UNIT_SECOND    0
+#define TIME_UNIT_MINUTE    1
+#define TIME_UNIT_HOUR      2
+#define TIME_UNIT_DAY       3
+#define MAX_TIME_UNITS 4
+static char *time_unit_name[MAX_TIME_UNITS] = {
+       "second(s)",
+       "minute(s)",
+       "hour(s)",
+       "day(s)",
+};
+
+/* create one of the duration options */
+/* (and select the matching unit depending on the given value) */
+static GtkWidget *time_unit_option_menu_new(guint32 value) {
+    GtkWidget *unit_om, *menu, *menu_item;
+    int i;
+
+       unit_om=gtk_option_menu_new();
+       menu=gtk_menu_new();
+       for(i=0;i<MAX_TIME_UNITS;i++){
+               menu_item=gtk_menu_item_new_with_label(time_unit_name[i]);
+               OBJECT_SET_DATA(menu_item, "time_unit", GINT_TO_POINTER(i));
+               gtk_menu_append(GTK_MENU(menu), menu_item);
+       }
+
+    /* the selected menu item can't be changed, once the option_menu
+       is created, so set the matching menu item now */
+    /* days */
+    if(value >= 60 * 60 * 24) {
+           gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_DAY);
+    } else {
+        /* hours */
+        if(value >= 60 * 60) {
+               gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_HOUR);
+        } else {
+            /* minutes */
+            if(value >= 60) {
+                   gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_MINUTE);
+            } else {
+                /* seconds */
+                   gtk_menu_set_active(GTK_MENU(menu), TIME_UNIT_SECOND);
+            }
+        }
+    }
+
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
+
+    return unit_om;
+}
+
+/* convert time value from raw to displayed (e.g. 60s -> 1min) */
+static guint32 time_unit_option_menu_convert_value(
+guint32 value)
+{
+    /* days */
+    if(value >= 60 * 60 * 24) {
+        return value / (60 * 60 * 24);
+    }
+
+    /* hours */
+    if(value >= 60 * 60) {
+        return value / (60 * 60);
+    }
+
+    /* minutes */
+    if(value >= 60) {
+        return value / 60;
+    }
+
+    /* seconds */
+    return value;
+}
+
+/* get raw value from unit and value fields */
+static guint32 time_unit_option_menu_get_value(
+GtkWidget *unit_om,
+guint32 value)
+{
+       GtkWidget *menu, *menu_item;
+    int unit;
+
+    menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
+    menu_item = gtk_menu_get_active(GTK_MENU(menu));
+    unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "time_unit"));
+
+
+    switch(unit) {
+    case(TIME_UNIT_SECOND):
+        return value;
+        break;
+    case(TIME_UNIT_MINUTE):
+        return value * 60;
+        break;
+    case(TIME_UNIT_HOUR):
+        return value * 60 * 60;
+        break;
+    case(TIME_UNIT_DAY):
+        return value * 60 * 60 * 24;
+        break;
+    default:
+        g_assert_not_reached();
+        return 0;
+    }
+}
+
+
+#define SIZE_UNIT_BYTES     0
+#define SIZE_UNIT_KILOBYTES 1
+#define SIZE_UNIT_MEGABYTES 2
+#define SIZE_UNIT_GIGABYTES 3
+#define MAX_SIZE_UNITS 4
+static char *size_unit_name[MAX_SIZE_UNITS] = {
+       "byte(s)",
+       "kilobyte(s)",
+       "megabyte(s)",
+       "gigabyte(s)",
+};
+
+/* create one of the size options */
+/* (and select the matching unit depending on the given value) */
+static GtkWidget *size_unit_option_menu_new(guint32 value) {
+    GtkWidget *unit_om, *menu, *menu_item;
+    int i;
+
+       unit_om=gtk_option_menu_new();
+       menu=gtk_menu_new();
+       for(i=0;i<MAX_SIZE_UNITS;i++){
+               menu_item=gtk_menu_item_new_with_label(size_unit_name[i]);
+               OBJECT_SET_DATA(menu_item, "size_unit", GINT_TO_POINTER(i));
+               gtk_menu_append(GTK_MENU(menu), menu_item);
+       }
+
+    /* the selected menu item can't be changed, once the option_menu
+       is created, so set the matching menu item now */
+    /* gigabytes */
+    if(value >= 1024 * 1024 * 1024) {
+           gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_GIGABYTES);
+    } else {
+        /* megabytes */
+        if(value >= 1024 * 1024) {
+               gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_MEGABYTES);
+        } else {
+            /* kilobytes */
+            if(value >= 1024) {
+                   gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_KILOBYTES);
+            } else {
+                /* bytes */
+                   gtk_menu_set_active(GTK_MENU(menu), SIZE_UNIT_BYTES);
+            }
+        }
+    }
 
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(unit_om), menu);
+
+    return unit_om;
+}
+
+/* convert size value from raw to displayed (e.g. 1024 Bytes -> 1 KB) */
+static guint32 size_unit_option_menu_set_value(
+guint32 value)
+{
+    /* gigabytes */
+    if(value >= 1024 * 1024 * 1024) {
+        return value / (1024 * 1024 * 1024);
+    }
+
+    /* megabytes */
+    if(value >= 1024 * 1024) {
+        return value / (1024 * 1024);
+    }
+
+    /* kilobytes */
+    if(value >= 1024) {
+        return value / 1024;
+    }
+
+    /* bytes */
+    return value;
+}
+
+/* get raw value from unit and value fields */
+static guint32 size_unit_option_menu_convert_value(
+GtkWidget *unit_om,
+guint32 value)
+{
+       GtkWidget *menu, *menu_item;
+    int unit;
+
+    menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(unit_om));
+    menu_item = gtk_menu_get_active(GTK_MENU(menu));
+    unit = GPOINTER_TO_INT(OBJECT_GET_DATA(menu_item, "size_unit"));
+
+
+    switch(unit) {
+    case(SIZE_UNIT_BYTES):
+        return value;
+        break;
+    case(SIZE_UNIT_KILOBYTES):
+        if(value > G_MAXINT / 1024) {
+            return 0;
+        } else {
+            return value * 1024;
+        }
+        break;
+    case(SIZE_UNIT_MEGABYTES):
+        if(value > G_MAXINT / (1024 * 1024)) {
+            return 0;
+        } else {
+            return value * 1024 * 1024;
+        }
+        break;
+    case(SIZE_UNIT_GIGABYTES):
+        if(value > G_MAXINT / (1024 * 1024 * 1024)) {
+            return 0;
+        } else {
+            return value * 1024 * 1024 * 1024;
+        }
+        break;
+    default:
+        g_assert_not_reached();
+        return 0;
+    }
+}
+
+
+/* show capture prepare (options) dialog */
 void
 capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 {
   GtkWidget     *main_vb,
+                *main_hb, *left_vb, *right_vb,
+
                 *capture_fr, *capture_vb,
                 *if_hb, *if_cb, *if_lb,
+                *if_ip_hb, *if_ip_lb,
+                *linktype_hb, *linktype_lb, *linktype_om,
                 *snap_hb, *snap_cb, *snap_sb, *snap_lb,
                 *promisc_cb,
-                *filter_hb, *filter_bt, *filter_te,
+                *filter_hb, *filter_bt, *filter_te, *filter_cm,
+
                 *file_fr, *file_vb,
-                *file_hb, *file_bt, *file_te,
-                *ringbuffer_hb, *ringbuffer_on_tb, *ringbuffer_nbf_lb, *ringbuffer_nbf_sb,
+                *file_hb, *file_bt, *file_lb, *file_te,
+                *multi_tb, *multi_files_on_cb,
+                *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+                *file_duration_cb, *file_duration_sb, *file_duration_om,
+                *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
+                *stop_files_cb, *stop_files_sb, *stop_files_lb,
+
+                *limit_fr, *limit_vb, *limit_tb,
+                *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
+                *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+                *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+
                 *display_fr, *display_vb,
-                *sync_cb, *auto_scroll_cb,
-                *limit_fr, *limit_vb,
-                *count_hb, *count_cb, *count_sb, *count_lb,
-                *filesize_hb, *filesize_cb, *filesize_sb, *filesize_lb,
-                *duration_hb, *duration_cb, *duration_sb, *duration_lb,
-               *ring_duration_hb, *ring_duration_cb, *ring_duration_sb, 
-               *ring_duration_lb,
+                *sync_cb, *auto_scroll_cb, *hide_info_cb,
+
                 *resolv_fr, *resolv_vb,
                 *m_resolv_cb, *n_resolv_cb, *t_resolv_cb,
-                *bbox, *ok_bt, *cancel_bt;
+                *bbox, *ok_bt, *cancel_bt,
+                *help_bt;
 #if GTK_MAJOR_VERSION < 2
   GtkAccelGroup *accel_group;
 #endif
+  GtkTooltips   *tooltips;
   GtkAdjustment *snap_adj, *ringbuffer_nbf_adj,
-               *count_adj, *filesize_adj, *duration_adj, *ring_duration_adj;
-  GList         *if_list;
+               *stop_packets_adj, *stop_filesize_adj, *stop_duration_adj, *stop_files_adj, *ring_filesize_adj, *file_duration_adj;
+  GList         *if_list, *combo_list, *cfilter_list;
   int           err;
+  int           row;
   char          err_str[PCAP_ERRBUF_SIZE];
+  gchar         *cant_get_if_list_errstr;
+#ifdef _WIN32
+  GtkAdjustment *buffer_size_adj;
+  GtkWidget     *buffer_size_lb, *buffer_size_sb;
+#endif
+  guint32       value;
+  gchar         *cap_title;
+  gchar         *if_device;
+
 
   if (cap_open_w != NULL) {
     /* There's already a "Capture Options" dialog box; reactivate it. */
@@ -159,12 +563,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 #ifdef _WIN32
   /* Is WPcap loaded? */
   if (!has_wpcap) {
-         simple_dialog(ESD_TYPE_CRIT, NULL,
+         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                  "Unable to load WinPcap (wpcap.dll); Ethereal will not be able\n"
                  "to capture packets.\n\n"
                  "In order to capture packets, WinPcap must be installed; see\n"
                  "\n"
-                 "        http://winpcap.polito.it/\n"
+                 "        http://www.winpcap.org/\n"
                  "\n"
                  "or the mirror at\n"
                  "\n"
@@ -182,12 +586,19 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
 
   if_list = get_interface_list(&err, err_str);
   if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) {
-    simple_dialog(ESD_TYPE_WARN, NULL, "Can't get list of interfaces: %s",
-                       err_str);
+    cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s",
+                  cant_get_if_list_errstr);
+    g_free(cant_get_if_list_errstr);
   }
 
-  cap_open_w = dlg_window_new("Ethereal: Capture Options");
-  SIGNAL_CONNECT(cap_open_w, "destroy", capture_prep_destroy_cb, NULL);
+  /* use user-defined title if preference is set */
+  cap_title = create_user_window_title("Ethereal: Capture Options");
+
+  cap_open_w = dlg_window_new(cap_title);
+  g_free(cap_title);
+
+  tooltips = gtk_tooltips_new();
 
 #if GTK_MAJOR_VERSION < 2
   /* Accelerator group for the accelerators (or, as they're called in
@@ -200,406 +611,545 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   main_vb = gtk_vbox_new(FALSE, 0);
   gtk_container_border_width(GTK_CONTAINER(main_vb), 5);
   gtk_container_add(GTK_CONTAINER(cap_open_w), main_vb);
-  gtk_widget_show(main_vb);
 
   /* Capture-related options frame */
   capture_fr = gtk_frame_new("Capture");
   gtk_container_add(GTK_CONTAINER(main_vb), capture_fr);
-  gtk_widget_show(capture_fr);
 
-  capture_vb = gtk_vbox_new(FALSE, 0);
+  capture_vb = gtk_vbox_new(FALSE, 3);
+  gtk_container_border_width(GTK_CONTAINER(capture_vb), 5);
   gtk_container_add(GTK_CONTAINER(capture_fr), capture_vb);
-  gtk_widget_show(capture_vb);
 
   /* Interface row */
   if_hb = gtk_hbox_new(FALSE, 3);
   gtk_container_add(GTK_CONTAINER(capture_vb), if_hb);
-  gtk_widget_show(if_hb);
 
   if_lb = gtk_label_new("Interface:");
   gtk_box_pack_start(GTK_BOX(if_hb), if_lb, FALSE, FALSE, 6);
-  gtk_widget_show(if_lb);
 
   if_cb = gtk_combo_new();
-  if (if_list != NULL)
-    gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), if_list);
-  if (cfile.iface == NULL && prefs.capture_device != NULL) {
+  combo_list = build_capture_combo_list(if_list, TRUE);
+  if (combo_list != NULL)
+    gtk_combo_set_popdown_strings(GTK_COMBO(if_cb), combo_list);
+  if (capture_opts->iface == NULL && prefs.capture_device != NULL) {
     /* No interface was specified on the command line or in a previous
        capture, but there is one specified in the preferences file;
        make the one from the preferences file the default */
-    cfile.iface        = g_strdup(prefs.capture_device);
+    if_device = g_strdup(prefs.capture_device);
+    capture_opts->iface = g_strdup(get_if_name(if_device));
+    g_free(if_device);
+  }
+  if (capture_opts->iface != NULL) {
+    if_device = build_capture_combo_name(if_list, capture_opts->iface);
+    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_device);
+    g_free(if_device);
+  } else if (combo_list != NULL) {
+    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry),
+                      (char *)combo_list->data);
   }
-  if (cfile.iface != NULL)
-    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), cfile.iface);
-  else if (if_list != NULL)
-    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry), if_list->data);
+  free_capture_combo_list(combo_list);
+  free_interface_list(if_list);
+  gtk_tooltips_set_tip(tooltips, GTK_COMBO(if_cb)->entry,
+    "Choose which interface (network card) will be used to capture packets from. "
+    "Be sure to select the correct one, as it's a common mistake to select the wrong interface.", NULL);
   gtk_box_pack_start(GTK_BOX(if_hb), if_cb, TRUE, TRUE, 6);
-  gtk_widget_show(if_cb);
 
-  free_interface_list(if_list);
+  if_ip_hb = gtk_hbox_new(FALSE, 3);
+  gtk_box_pack_start(GTK_BOX(capture_vb), if_ip_hb, FALSE, FALSE, 0);
+
+  if_ip_lb = gtk_label_new("");
+  gtk_box_pack_start(GTK_BOX(if_ip_hb), if_ip_lb, FALSE, FALSE, 6);
+
+  /* Linktype row */
+  linktype_hb = gtk_hbox_new(FALSE, 3);
+  gtk_box_pack_start(GTK_BOX(capture_vb), linktype_hb, FALSE, FALSE, 0);
+
+  linktype_lb = gtk_label_new("Link-layer header type:");
+  gtk_box_pack_start(GTK_BOX(linktype_hb), linktype_lb, FALSE, FALSE, 6);
+
+  linktype_om = gtk_option_menu_new();
+  OBJECT_SET_DATA(linktype_om, E_CAP_LT_OM_LABEL_KEY, linktype_lb);
+  /* Default to "use the default" */
+  OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(-1));
+  OBJECT_SET_DATA(linktype_om, E_CAP_IFACE_KEY, if_ip_lb);
+  set_link_type_list(linktype_om, GTK_COMBO(if_cb)->entry);
+  /*
+   * XXX - in some cases, this is "multiple link-layer header types", e.g.
+   * some 802.11 interfaces on FreeBSD 5.2 and later, where you can request
+   * fake Ethernet, 802.11, or 802.11-plus-radio-information headers.
+   *
+   * In other cases, it's "multiple link-layer types", e.g., with recent
+   * versions of libpcap, a DAG card on an "HDLC" WAN, where you can
+   * request Cisco HDLC or PPP depending on what type of traffic is going
+   * over the WAN, or an Ethernet interface, where you can request Ethernet
+   * or DOCSIS, the latter being for some Cisco cable modem equipment that
+   * can be configured to send raw DOCSIS frames over an Ethernet inside
+   * Ethernet low-level framing, for traffic capture purposes.
+   *
+   * We leave it as "multiple link-layer types" for now.
+   */
+  gtk_tooltips_set_tip(tooltips, linktype_om,
+    "The selected interface supports multiple link-layer types; select the desired one.", NULL);
+  gtk_box_pack_start (GTK_BOX(linktype_hb), linktype_om, FALSE, FALSE, 0);
+  SIGNAL_CONNECT(GTK_ENTRY(GTK_COMBO(if_cb)->entry), "changed",
+                 capture_prep_interface_changed_cb, linktype_om);
+
+#ifdef _WIN32
+  buffer_size_lb = gtk_label_new("Buffer size:");
+  gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
+
+  buffer_size_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts->buffer_size,
+    1, 65535, 1.0, 10.0, 0.0);
+  buffer_size_sb = gtk_spin_button_new (buffer_size_adj, 0, 0);
+  gtk_spin_button_set_value(GTK_SPIN_BUTTON (buffer_size_sb), (gfloat) capture_opts->buffer_size);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (buffer_size_sb), TRUE);
+  WIDGET_SET_SIZE(buffer_size_sb, 80, -1);
+  gtk_tooltips_set_tip(tooltips, buffer_size_sb,
+    "The memory buffer size used while capturing. If you notice packet drops, you can try to increase this size.", NULL);
+  gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_sb, FALSE, FALSE, 0);
+
+  buffer_size_lb = gtk_label_new("megabyte(s)");
+  gtk_box_pack_start (GTK_BOX(linktype_hb), buffer_size_lb, FALSE, FALSE, 0);
+#endif
+
+  /* Promiscuous mode row */
+  promisc_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+      "Capture packets in _promiscuous mode", accel_group);
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(promisc_cb),
+               capture_opts->promisc_mode);
+  gtk_tooltips_set_tip(tooltips, promisc_cb,
+    "Usually a network card will only capture the traffic sent to its own network address. "
+    "If you want to capture all traffic that the network card can \"see\", mark this option. "
+    "See the FAQ for some more details of capturing packets from a switched network.", NULL);
+  gtk_container_add(GTK_CONTAINER(capture_vb), promisc_cb);
 
   /* Capture length row */
   snap_hb = gtk_hbox_new(FALSE, 3);
   gtk_container_add(GTK_CONTAINER(capture_vb), snap_hb);
-  gtk_widget_show(snap_hb);
 
-#if GTK_MAJOR_VERSION < 2
-  snap_cb = dlg_check_button_new_with_label_with_mnemonic(
-               "_Limit each packet to", accel_group);
-#else
-  snap_cb = gtk_check_button_new_with_mnemonic("_Limit each packet to");
-#endif
+  snap_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("_Limit each packet to", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(snap_cb),
-               capture_opts.has_snaplen);
+               capture_opts->has_snaplen);
   SIGNAL_CONNECT(snap_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, snap_cb,
+    "Limit the maximum number of bytes to be captured from each packet. This size includes the "
+    "link-layer header and all subsequent headers. ", NULL);
   gtk_box_pack_start(GTK_BOX(snap_hb), snap_cb, FALSE, FALSE, 0);
-  gtk_widget_show(snap_cb);
 
-  snap_adj = (GtkAdjustment *) gtk_adjustment_new((float) capture_opts.snaplen,
+  snap_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts->snaplen,
     MIN_PACKET_SIZE, WTAP_MAX_PACKET_SIZE, 1.0, 10.0, 0.0);
   snap_sb = gtk_spin_button_new (snap_adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (snap_sb), TRUE);
   WIDGET_SET_SIZE(snap_sb, 80, -1);
   gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0);
-  gtk_widget_show(snap_sb);
 
   snap_lb = gtk_label_new("bytes");
   gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5);
   gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0);
-  gtk_widget_show(snap_lb);
-
-  /* Promiscuous mode row */
-#if GTK_MAJOR_VERSION < 2
-  promisc_cb = dlg_check_button_new_with_label_with_mnemonic(
-               "Capture packets in _promiscuous mode", accel_group);
-#else
-  promisc_cb = gtk_check_button_new_with_mnemonic(
-               "Capture packets in _promiscuous mode");
-#endif
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(promisc_cb),
-               capture_opts.promisc_mode);
-  gtk_container_add(GTK_CONTAINER(capture_vb), promisc_cb);
-  gtk_widget_show(promisc_cb);
 
   /* Filter row */
   filter_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(capture_vb), filter_hb);
-  gtk_widget_show(filter_hb);
+  gtk_box_pack_start(GTK_BOX(capture_vb), filter_hb, FALSE, FALSE, 0);
 
-  filter_bt = gtk_button_new_with_label("Filter:");
+  filter_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_CAPTURE_FILTER_ENTRY);
   SIGNAL_CONNECT(filter_bt, "clicked", capture_filter_construct_cb, NULL);
   SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL);
+  gtk_tooltips_set_tip(tooltips, filter_bt,
+    "Select a capture filter to reduce the amount of packets to be captured. "
+    "See \"Capture Filters\" in the online help for further information how to use it.",
+    NULL);
   gtk_box_pack_start(GTK_BOX(filter_hb), filter_bt, FALSE, FALSE, 3);
-  gtk_widget_show(filter_bt);
 
-  filter_te = gtk_entry_new();
-  if (cfile.cfilter) gtk_entry_set_text(GTK_ENTRY(filter_te), cfile.cfilter);
+  /* Create the capture filter combo */
+  filter_cm = gtk_combo_new();
+
+  cfilter_list = OBJECT_GET_DATA(top_level, E_CFILTER_FL_KEY);
+  gtk_combo_disable_activate(GTK_COMBO(filter_cm));
+  gtk_combo_set_case_sensitive(GTK_COMBO(filter_cm), TRUE);
+  OBJECT_SET_DATA(top_level, E_CFILTER_FL_KEY, cfilter_list);
+  OBJECT_SET_DATA(top_level, E_CFILTER_CM_KEY, filter_cm);
+  filter_te = GTK_COMBO(filter_cm)->entry;
+
+  if (cfilter_list != NULL)
+    gtk_combo_set_popdown_strings(GTK_COMBO(filter_cm), cfilter_list);
+  if (capture_opts->cfilter)
+    gtk_entry_set_text(GTK_ENTRY(filter_te), capture_opts->cfilter);
+  gtk_tooltips_set_tip(tooltips, filter_te,
+    "Enter a capture filter to reduce the amount of packets to be captured. "
+    "See \"Capture Filters\" in the online help for further information how to use it.",
+    NULL);
+  WIDGET_SET_SIZE(filter_cm, 400, -1);
+  gtk_box_pack_start(GTK_BOX(filter_hb), filter_cm, FALSE, FALSE, 3);
+  main_hb = gtk_hbox_new(FALSE, 5);
+  gtk_container_border_width(GTK_CONTAINER(main_hb), 0);
+  gtk_container_add(GTK_CONTAINER(main_vb), main_hb);
+
+  left_vb = gtk_vbox_new(FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(left_vb), 0);
+  gtk_box_pack_start(GTK_BOX(main_hb), left_vb, TRUE, TRUE, 0);
+
+  right_vb = gtk_vbox_new(FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(right_vb), 0);
+  gtk_box_pack_start(GTK_BOX(main_hb), right_vb, FALSE, FALSE, 0);
+
+  /* let an eventually capture filters dialog know the text entry to fill in */
   OBJECT_SET_DATA(filter_bt, E_FILT_TE_PTR_KEY, filter_te);
-  gtk_box_pack_start(GTK_BOX(filter_hb), filter_te, TRUE, TRUE, 3);
-  gtk_widget_show(filter_te);
 
   /* Capture file-related options frame */
-  file_fr = gtk_frame_new("Capture file(s)");
-  gtk_container_add(GTK_CONTAINER(main_vb), file_fr);
-  gtk_widget_show(file_fr);
+  file_fr = gtk_frame_new("Capture File(s)");
+  gtk_container_add(GTK_CONTAINER(left_vb), file_fr);
 
   file_vb = gtk_vbox_new(FALSE, 3);
+  gtk_container_border_width(GTK_CONTAINER(file_vb), 5);
   gtk_container_add(GTK_CONTAINER(file_fr), file_vb);
-  gtk_widget_show(file_vb);
 
   /* File row */
   file_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(file_vb), file_hb);
-  gtk_widget_show(file_hb);
+  gtk_box_pack_start(GTK_BOX(file_vb), file_hb, FALSE, FALSE, 0);
 
-  file_bt = gtk_button_new_with_label("File:");
-  gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
-  gtk_widget_show(file_bt);
+  file_lb = gtk_label_new("File:");
+  gtk_box_pack_start(GTK_BOX(file_hb), file_lb, FALSE, FALSE, 3);
 
   file_te = gtk_entry_new();
+  gtk_tooltips_set_tip(tooltips, file_te,
+    "Enter the file name to which captured data will be written. "
+    "If you don't enter something here, a temporary file will be used.",
+    NULL);
   gtk_box_pack_start(GTK_BOX(file_hb), file_te, TRUE, TRUE, 3);
-  gtk_widget_show(file_te);
 
-  SIGNAL_CONNECT(file_bt, "clicked", capture_prep_file_cb, file_te);
+  file_bt = BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_BROWSE);
+  gtk_tooltips_set_tip(tooltips, file_bt,
+    "Select a file to which captured data will be written, "
+    "instead of entering the file name directly. ",
+    NULL);
+  gtk_box_pack_start(GTK_BOX(file_hb), file_bt, FALSE, FALSE, 3);
 
-  /* Ring buffer row */
-  ringbuffer_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(file_vb), ringbuffer_hb);
-  gtk_widget_show(ringbuffer_hb);
+  SIGNAL_CONNECT(file_bt, "clicked", capture_prep_file_cb, file_te);
 
-#if GTK_MAJOR_VERSION < 2
-  ringbuffer_on_tb = dlg_check_button_new_with_label_with_mnemonic(
-    "Use _ring buffer", accel_group);
-#else
-  ringbuffer_on_tb = gtk_check_button_new_with_mnemonic("Use _ring buffer");
-#endif
-  /* Ring buffer mode is allowed only if we're not doing an "Update list of
-     packets in real time" capture, so force it off if we're doing such
-     a capture. */
-  if (capture_opts.sync_mode)
-    capture_opts.ringbuffer_on = FALSE;
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ringbuffer_on_tb),
-               capture_opts.ringbuffer_on);
-  SIGNAL_CONNECT(ringbuffer_on_tb, "toggled", capture_prep_adjust_sensitivity,
+  /* multiple files table */
+  multi_tb = gtk_table_new(5, 3, FALSE);
+  gtk_table_set_row_spacings(GTK_TABLE(multi_tb), 1);
+  gtk_table_set_col_spacings(GTK_TABLE(multi_tb), 3);
+  gtk_box_pack_start(GTK_BOX(file_vb), multi_tb, FALSE, FALSE, 0);
+  row = 0;
+
+  /* multiple files row */
+  multi_files_on_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC("Use _multiple files", accel_group);
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(multi_files_on_cb),
+               capture_opts->multi_files_on);
+  SIGNAL_CONNECT(multi_files_on_cb, "toggled", capture_prep_adjust_sensitivity,
                  cap_open_w);
-  gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_on_tb, FALSE, FALSE, 0);
-  gtk_widget_show(ringbuffer_on_tb);
+  gtk_tooltips_set_tip(tooltips, multi_files_on_cb,
+    "Instead of using a single capture file, multiple files will be created. "
+    "The generated file names will contain an incrementing number and the start time of the capture.", NULL);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), multi_files_on_cb, 0, 1, row, row+1);
+  row++;
+
+  /* Ring buffer filesize row */
+  ring_filesize_cb = gtk_check_button_new_with_label("Next file every");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ring_filesize_cb),
+               capture_opts->has_autostop_filesize);
+  SIGNAL_CONNECT(ring_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, ring_filesize_cb,
+    "If the selected file size is exceeded, capturing switches to the next file.\n"
+    "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.",
+    NULL);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_cb, 0, 1, row, row+1);
+
+  ring_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  ring_filesize_sb = gtk_spin_button_new (ring_filesize_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ring_filesize_sb), TRUE);
+  WIDGET_SET_SIZE(ring_filesize_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_sb, 1, 2, row, row+1);
+
+  ring_filesize_om = size_unit_option_menu_new(capture_opts->autostop_filesize);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ring_filesize_om, 2, 3, row, row+1);
+
+  value = size_unit_option_menu_set_value(capture_opts->autostop_filesize);
+  gtk_adjustment_set_value(ring_filesize_adj, (gfloat) value);
+
+  row++;
 
-  ringbuffer_nbf_lb = gtk_label_new("Number of files");
-  gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 1, 0.5);
-  gtk_box_pack_start(GTK_BOX(ringbuffer_hb), ringbuffer_nbf_lb, FALSE, FALSE, 6);
-  gtk_widget_show(ringbuffer_nbf_lb);
-
-  ringbuffer_nbf_adj = (GtkAdjustment *) gtk_adjustment_new((float) capture_opts.ringbuffer_num_files,
-    RINGBUFFER_MIN_NUM_FILES, RINGBUFFER_MAX_NUM_FILES, 1.0, 10.0, 0.0);
+  /* Ring buffer duration row */
+  file_duration_cb = gtk_check_button_new_with_label("Next file every");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(file_duration_cb),
+                             capture_opts->has_file_duration);
+  SIGNAL_CONNECT(file_duration_cb, "toggled",
+                capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, file_duration_cb,
+    "If the selected duration is exceeded, capturing switches to the next file.\n"
+    "PLEASE NOTE: at least one of the \"Next file every\" options MUST be selected.",
+    NULL);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_cb, 0, 1, row, row+1);
+
+  file_duration_adj = (GtkAdjustment *)gtk_adjustment_new(0.0,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  file_duration_sb = gtk_spin_button_new (file_duration_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (file_duration_sb), TRUE);
+  WIDGET_SET_SIZE(file_duration_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_sb, 1, 2, row, row+1);
+
+  file_duration_om = time_unit_option_menu_new(capture_opts->file_duration);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), file_duration_om, 2, 3, row, row+1);
+
+  value = time_unit_option_menu_convert_value(capture_opts->file_duration);
+  gtk_adjustment_set_value(file_duration_adj, (gfloat) value);
+  row++;
+
+  /* Ring buffer files row */
+  ringbuffer_nbf_cb = gtk_check_button_new_with_label("Ring buffer with");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb),
+               capture_opts->has_ring_num_files);
+  SIGNAL_CONNECT(ringbuffer_nbf_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, ringbuffer_nbf_cb,
+    "After capturing has switched to the next file and the given number of files has exceeded, "
+    "the oldest file will be removed.",
+    NULL);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_cb, 0, 1, row, row+1);
+
+  ringbuffer_nbf_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat) capture_opts->ring_num_files,
+    2/*RINGBUFFER_MIN_NUM_FILES*/, RINGBUFFER_MAX_NUM_FILES, 1.0, 10.0, 0.0);
   ringbuffer_nbf_sb = gtk_spin_button_new (ringbuffer_nbf_adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ringbuffer_nbf_sb), TRUE);
-  WIDGET_SET_SIZE(ringbuffer_nbf_sb, 40, -1);
-  gtk_box_pack_start (GTK_BOX(ringbuffer_hb), ringbuffer_nbf_sb, TRUE, TRUE, 0);
-  gtk_widget_show(ringbuffer_nbf_sb);
+  WIDGET_SET_SIZE(ringbuffer_nbf_sb, 80, -1);
+  SIGNAL_CONNECT(ringbuffer_nbf_sb, "changed", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_sb, 1, 2, row, row+1);
+
+  ringbuffer_nbf_lb = gtk_label_new("files");
+  gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_lb, 2, 3, row, row+1);
+  row++;
+
+  /* Files row */
+  stop_files_cb = gtk_check_button_new_with_label("Stop capture after");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_files_cb),
+               capture_opts->has_autostop_files);
+  SIGNAL_CONNECT(stop_files_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, stop_files_cb,
+    "Stop capturing after the given number of \"file switches\" have been done.", NULL);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_cb, 0, 1, row, row+1);
+
+  stop_files_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts->autostop_files,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  stop_files_sb = gtk_spin_button_new (stop_files_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_files_sb), TRUE);
+  WIDGET_SET_SIZE(stop_files_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_sb, 1, 2, row, row+1);
+
+  stop_files_lb = gtk_label_new("file(s)");
+  gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5);
+  gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_lb, 2, 3, row, row+1);
+  row++;
 
-  /* Ring buffer duration row */
-  ring_duration_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(file_vb), ring_duration_hb);
-  gtk_widget_show(ring_duration_hb);
-
-  ring_duration_cb = gtk_check_button_new_with_label("Rotate capture file every");
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ring_duration_cb),
-                             capture_opts.has_ring_duration);
-  SIGNAL_CONNECT(ring_duration_cb, "toggled", 
-                capture_prep_adjust_sensitivity, cap_open_w);
-  gtk_box_pack_start(GTK_BOX(ring_duration_hb), ring_duration_cb, 
-                    FALSE, FALSE, 0);
-  gtk_widget_show(ring_duration_cb);
-
-  ring_duration_adj = (GtkAdjustment *)gtk_adjustment_new(capture_opts.ringbuffer_duration,
-    1, INT_MAX, 1.0, 10.0, 0.0);
-  ring_duration_sb = gtk_spin_button_new (ring_duration_adj, 0, 0);
-  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (ring_duration_sb), TRUE);
-  WIDGET_SET_SIZE(ring_duration_sb, 80, -1);
-  gtk_box_pack_start (GTK_BOX(ring_duration_hb), ring_duration_sb, 
-                     FALSE, FALSE, 0);
-  gtk_widget_show(ring_duration_sb);
-
-  ring_duration_lb = gtk_label_new("second(s)");
-  gtk_misc_set_alignment(GTK_MISC(ring_duration_lb), 0, 0.5);
-  gtk_box_pack_start(GTK_BOX(ring_duration_hb), ring_duration_lb, 
-                    FALSE, FALSE, 0);
-  gtk_widget_show(ring_duration_lb);
+  /* Capture limits frame */
+  limit_fr = gtk_frame_new("Stop Capture ...");
+  gtk_container_add(GTK_CONTAINER(left_vb), limit_fr);
+
+  limit_vb = gtk_vbox_new(FALSE, 3);
+  gtk_container_border_width(GTK_CONTAINER(limit_vb), 5);
+  gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb);
+
+  /* limits table */
+  limit_tb = gtk_table_new(3, 3, FALSE);
+  gtk_table_set_row_spacings(GTK_TABLE(limit_tb), 1);
+  gtk_table_set_col_spacings(GTK_TABLE(limit_tb), 3);
+  gtk_box_pack_start(GTK_BOX(limit_vb), limit_tb, FALSE, FALSE, 0);
+  row = 0;
+
+  /* Packet count row */
+  stop_packets_cb = gtk_check_button_new_with_label("... after");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_packets_cb),
+               capture_opts->has_autostop_packets);
+  SIGNAL_CONNECT(stop_packets_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, stop_packets_cb,
+    "Stop capturing after the given number of packets have been captured.", NULL);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_cb, 0, 1, row, row+1);
+
+  stop_packets_adj = (GtkAdjustment *) gtk_adjustment_new((gfloat)capture_opts->autostop_packets,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  stop_packets_sb = gtk_spin_button_new (stop_packets_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_packets_sb), TRUE);
+  WIDGET_SET_SIZE(stop_packets_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_sb, 1, 2, row, row+1);
+
+  stop_packets_lb = gtk_label_new("packet(s)");
+  gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_lb, 2, 3, row, row+1);
+  row++;
+
+  /* Filesize row */
+  stop_filesize_cb = gtk_check_button_new_with_label("... after");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_filesize_cb),
+               capture_opts->has_autostop_filesize);
+  SIGNAL_CONNECT(stop_filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, stop_filesize_cb,
+    "Stop capturing after the given amount of capture data has been captured.", NULL);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_cb, 0, 1, row, row+1);
+
+  stop_filesize_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  stop_filesize_sb = gtk_spin_button_new (stop_filesize_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_filesize_sb), TRUE);
+  WIDGET_SET_SIZE(stop_filesize_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_sb, 1, 2, row, row+1);
+
+  stop_filesize_om = size_unit_option_menu_new(capture_opts->autostop_filesize);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_filesize_om, 2, 3, row, row+1);
+
+  value = size_unit_option_menu_set_value(capture_opts->autostop_filesize);
+  gtk_adjustment_set_value(stop_filesize_adj, (gfloat) value);
+
+  row++;
+
+  /* Duration row */
+  stop_duration_cb = gtk_check_button_new_with_label("... after");
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(stop_duration_cb),
+               capture_opts->has_autostop_duration);
+  SIGNAL_CONNECT(stop_duration_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, stop_duration_cb,
+    "Stop capturing after the given time is exceeded.", NULL);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_cb, 0, 1, row, row+1);
+
+  stop_duration_adj = (GtkAdjustment *) gtk_adjustment_new(0.0,
+    1, (gfloat)INT_MAX, 1.0, 10.0, 0.0);
+  stop_duration_sb = gtk_spin_button_new (stop_duration_adj, 0, 0);
+  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_duration_sb), TRUE);
+  WIDGET_SET_SIZE(stop_duration_sb, 80, -1);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_sb, 1, 2, row, row+1);
+
+  stop_duration_om = time_unit_option_menu_new(capture_opts->autostop_duration);
+  gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_duration_om, 2, 3, row, row+1);
+
+  value = time_unit_option_menu_convert_value(capture_opts->autostop_duration);
+  gtk_adjustment_set_value(stop_duration_adj, (gfloat) value);
+  row++;
 
   /* Display-related options frame */
-  display_fr = gtk_frame_new("Display options");
-  gtk_container_add(GTK_CONTAINER(main_vb), display_fr);
-  gtk_widget_show(display_fr);
+  display_fr = gtk_frame_new("Display Options");
+  gtk_container_add(GTK_CONTAINER(right_vb), display_fr);
 
   display_vb = gtk_vbox_new(FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(display_vb), 5);
   gtk_container_add(GTK_CONTAINER(display_fr), display_vb);
-  gtk_widget_show(display_vb);
 
   /* "Update display in real time" row */
-#if GTK_MAJOR_VERSION < 2
-  sync_cb = dlg_check_button_new_with_label_with_mnemonic(
-               "_Update list of packets in real time", accel_group);
-#else
-  sync_cb = gtk_check_button_new_with_mnemonic(
-               "_Update list of packets in real time");
-#endif
+  sync_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+      "_Update list of packets in real time", accel_group);
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sync_cb),
-               capture_opts.sync_mode);
+               capture_opts->real_time_mode);
   SIGNAL_CONNECT(sync_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, sync_cb,
+    "Using this option will show the captured packets immediately on the main screen. "
+    "Please note: this will slow down capturing, so increased packet drops might appear.", NULL);
   gtk_container_add(GTK_CONTAINER(display_vb), sync_cb);
-  gtk_widget_show(sync_cb);
 
   /* "Auto-scroll live update" row */
-#if GTK_MAJOR_VERSION < 2
-  auto_scroll_cb = dlg_check_button_new_with_label_with_mnemonic(
+  auto_scroll_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
                "_Automatic scrolling in live capture", accel_group);
-#else
-  auto_scroll_cb = gtk_check_button_new_with_mnemonic(
-               "_Automatic scrolling in live capture");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(auto_scroll_cb), auto_scroll_live);
+  gtk_tooltips_set_tip(tooltips, auto_scroll_cb,
+    "This will scroll the \"Packet List\" automatically to the latest captured packet, "
+    "when the \"Update List of packets in real time\" option is used.", NULL);
   gtk_container_add(GTK_CONTAINER(display_vb), auto_scroll_cb);
-  gtk_widget_show(auto_scroll_cb);
-
-  /* Capture limits frame */
-  limit_fr = gtk_frame_new("Capture limits");
-  gtk_container_add(GTK_CONTAINER(main_vb), limit_fr);
-  gtk_widget_show(limit_fr);
 
-  limit_vb = gtk_vbox_new(FALSE, 0);
-  gtk_container_add(GTK_CONTAINER(limit_fr), limit_vb);
-  gtk_widget_show(limit_vb);
-
-  /* Count row */
-  count_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(limit_vb), count_hb);
-  gtk_widget_show(count_hb);
-
-  count_cb = gtk_check_button_new_with_label("Stop capture after");
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(count_cb),
-               capture_opts.has_autostop_count);
-  SIGNAL_CONNECT(count_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
-  gtk_box_pack_start(GTK_BOX(count_hb), count_cb, FALSE, FALSE, 0);
-  gtk_widget_show(count_cb);
-
-  count_adj = (GtkAdjustment *) gtk_adjustment_new(capture_opts.autostop_count,
-    1, INT_MAX, 1.0, 10.0, 0.0);
-  count_sb = gtk_spin_button_new (count_adj, 0, 0);
-  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (count_sb), TRUE);
-  WIDGET_SET_SIZE(count_sb, 80, -1);
-  gtk_box_pack_start (GTK_BOX(count_hb), count_sb, FALSE, FALSE, 0);
-  gtk_widget_show(count_sb);
-
-  count_lb = gtk_label_new("packet(s) captured");
-  gtk_misc_set_alignment(GTK_MISC(count_lb), 0, 0.5);
-  gtk_box_pack_start(GTK_BOX(count_hb), count_lb, FALSE, FALSE, 0);
-  gtk_widget_show(count_lb);
-
-  /* Filesize row */
-  filesize_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(limit_vb), filesize_hb);
-  gtk_widget_show(filesize_hb);
-
-  filesize_cb = gtk_check_button_new_with_label("");
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filesize_cb),
-               capture_opts.has_autostop_filesize);
-  SIGNAL_CONNECT(filesize_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
-  gtk_box_pack_start(GTK_BOX(filesize_hb), filesize_cb, FALSE, FALSE, 0);
-  gtk_widget_show(filesize_cb);
-
-  filesize_adj = (GtkAdjustment *) gtk_adjustment_new(capture_opts.autostop_filesize,
-    1, INT_MAX, 1.0, 10.0, 0.0);
-  filesize_sb = gtk_spin_button_new (filesize_adj, 0, 0);
-  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (filesize_sb), TRUE);
-  WIDGET_SET_SIZE(filesize_sb, 80, -1);
-  gtk_box_pack_start (GTK_BOX(filesize_hb), filesize_sb, FALSE, FALSE, 0);
-  gtk_widget_show(filesize_sb);
-
-  filesize_lb = gtk_label_new("");
-  gtk_misc_set_alignment(GTK_MISC(filesize_lb), 0, 0.5);
-  gtk_box_pack_start(GTK_BOX(filesize_hb), filesize_lb, FALSE, FALSE, 0);
-  gtk_widget_show(filesize_lb);
+  /* "Hide capture info" row */
+  hide_info_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
+               "_Hide capture info dialog", accel_group);
+  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(hide_info_cb), !capture_opts->show_info);
+  gtk_tooltips_set_tip(tooltips, hide_info_cb,
+    "Hide the capture info dialog while capturing.", NULL);
+  gtk_container_add(GTK_CONTAINER(display_vb), hide_info_cb);
 
-  /* Duration row */
-  duration_hb = gtk_hbox_new(FALSE, 3);
-  gtk_container_add(GTK_CONTAINER(limit_vb), duration_hb);
-  gtk_widget_show(duration_hb);
-
-  duration_cb = gtk_check_button_new_with_label("Stop capture after");
-  gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(duration_cb),
-               capture_opts.has_autostop_duration);
-  SIGNAL_CONNECT(duration_cb, "toggled", capture_prep_adjust_sensitivity, cap_open_w);
-  gtk_box_pack_start(GTK_BOX(duration_hb), duration_cb, FALSE, FALSE, 0);
-  gtk_widget_show(duration_cb);
-
-  duration_adj = (GtkAdjustment *) gtk_adjustment_new(capture_opts.autostop_duration,
-    1, INT_MAX, 1.0, 10.0, 0.0);
-  duration_sb = gtk_spin_button_new (duration_adj, 0, 0);
-  gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (duration_sb), TRUE);
-  WIDGET_SET_SIZE(duration_sb, 80, -1);
-  gtk_box_pack_start (GTK_BOX(duration_hb), duration_sb, FALSE, FALSE, 0);
-  gtk_widget_show(duration_sb);
-
-  duration_lb = gtk_label_new("second(s)");
-  gtk_misc_set_alignment(GTK_MISC(duration_lb), 0, 0.5);
-  gtk_box_pack_start(GTK_BOX(duration_hb), duration_lb, FALSE, FALSE, 0);
-  gtk_widget_show(duration_lb);
-
-  /* Resolution options frame */
-  resolv_fr = gtk_frame_new("Name resolution");
-  gtk_container_add(GTK_CONTAINER(main_vb), resolv_fr);
-  gtk_widget_show(resolv_fr);
+  /* Name Resolution frame */
+  resolv_fr = gtk_frame_new("Name Resolution");
+  gtk_container_add(GTK_CONTAINER(right_vb), resolv_fr);
 
   resolv_vb = gtk_vbox_new(FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(resolv_vb), 5);
   gtk_container_add(GTK_CONTAINER(resolv_fr), resolv_vb);
-  gtk_widget_show(resolv_vb);
 
-#if GTK_MAJOR_VERSION < 2
-  m_resolv_cb = dlg_check_button_new_with_label_with_mnemonic(
+  m_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
                "Enable _MAC name resolution", accel_group);
-#else
-  m_resolv_cb = gtk_check_button_new_with_mnemonic(
-               "Enable _MAC name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(m_resolv_cb),
                g_resolv_flags & RESOLV_MAC);
+  gtk_tooltips_set_tip(tooltips, m_resolv_cb,
+    "Perform MAC layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), m_resolv_cb);
-  gtk_widget_show(m_resolv_cb);
 
-#if GTK_MAJOR_VERSION < 2
-  n_resolv_cb = dlg_check_button_new_with_label_with_mnemonic(
+  n_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
                "Enable _network name resolution", accel_group);
-#else
-  n_resolv_cb = gtk_check_button_new_with_mnemonic(
-               "Enable _network name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(n_resolv_cb),
                g_resolv_flags & RESOLV_NETWORK);
+  gtk_tooltips_set_tip(tooltips, n_resolv_cb,
+    "Perform network layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), n_resolv_cb);
-  gtk_widget_show(n_resolv_cb);
 
-#if GTK_MAJOR_VERSION < 2
-  t_resolv_cb = dlg_check_button_new_with_label_with_mnemonic(
+  t_resolv_cb = CHECK_BUTTON_NEW_WITH_MNEMONIC(
                "Enable _transport name resolution", accel_group);
-#else
-  t_resolv_cb = gtk_check_button_new_with_mnemonic(
-               "Enable _transport name resolution");
-#endif
   gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(t_resolv_cb),
                g_resolv_flags & RESOLV_TRANSPORT);
+  gtk_tooltips_set_tip(tooltips, t_resolv_cb,
+    "Perform transport layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
-  gtk_widget_show(t_resolv_cb);
 
-  /* Button row: OK and cancel buttons */
-  bbox = gtk_hbutton_box_new();
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
-  gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-  gtk_container_add(GTK_CONTAINER(main_vb), bbox);
-  gtk_widget_show(bbox);
+  /* Button row: "Start" and "Cancel" buttons */
+  bbox = dlg_button_row_new(ETHEREAL_STOCK_CAPTURE_START, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
+  gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
-#if GTK_MAJOR_VERSION < 2
-  ok_bt = gtk_button_new_with_label ("OK");
-#else
-  ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK);
-#endif
-  SIGNAL_CONNECT(ok_bt, "clicked", capture_prep_ok_cb, cap_open_w);
-  GTK_WIDGET_SET_FLAGS(ok_bt, GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (bbox), ok_bt, TRUE, TRUE, 0);
-  gtk_widget_grab_default(ok_bt);
-  gtk_widget_show(ok_bt);
+  ok_bt = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CAPTURE_START);
+  SIGNAL_CONNECT(ok_bt, "clicked", capture_start_cb, cap_open_w);
+  gtk_tooltips_set_tip(tooltips, ok_bt,
+    "Start the capture process.", NULL);
 
-#if GTK_MAJOR_VERSION < 2
-  cancel_bt = gtk_button_new_with_label ("Cancel");
-#else
-  cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-#endif
-  SIGNAL_CONNECT(cancel_bt, "clicked", capture_prep_close_cb, cap_open_w);
-  GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (bbox), cancel_bt, TRUE, TRUE, 0);
-  gtk_widget_show(cancel_bt);
+  cancel_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL);
+  gtk_tooltips_set_tip(tooltips, cancel_bt,
+    "Cancel and exit dialog.", NULL);
+  window_set_cancel_button(cap_open_w, cancel_bt, window_cancel_button_cb);
+
+  help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
+  gtk_tooltips_set_tip(tooltips, help_bt,
+    "Show help about capturing.", NULL);
+  SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_CAPTURE_OPTIONS_DIALOG);
+
+  gtk_widget_grab_default(ok_bt);
 
   /* Attach pointers to needed widgets to the capture prefs window/object */
   OBJECT_SET_DATA(cap_open_w, E_CAP_IFACE_KEY, if_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_CB_KEY, snap_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_SNAP_SB_KEY, snap_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_LT_OM_KEY, linktype_om);
+#ifdef _WIN32
+  OBJECT_SET_DATA(cap_open_w, E_CAP_BUFFER_SIZE_SB_KEY, buffer_size_sb);
+#endif
   OBJECT_SET_DATA(cap_open_w, E_CAP_PROMISC_KEY, promisc_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_FILT_KEY,  filter_te);
   OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_TE_KEY,  file_te);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_ON_TB_KEY,  ringbuffer_on_tb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_LB_KEY,  ringbuffer_nbf_lb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_MULTI_FILES_ON_CB_KEY,  multi_files_on_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_CB_KEY,  ringbuffer_nbf_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_SB_KEY,  ringbuffer_nbf_sb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_DURATION_CB_KEY,  ring_duration_cb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_DURATION_SB_KEY,  ring_duration_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_NBF_LB_KEY,  ringbuffer_nbf_lb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_CB_KEY,  ring_filesize_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_SB_KEY,  ring_filesize_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_RING_FILESIZE_OM_KEY,  ring_filesize_om);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_CB_KEY,  file_duration_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_SB_KEY,  file_duration_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_FILE_DURATION_OM_KEY,  file_duration_om);
   OBJECT_SET_DATA(cap_open_w, E_CAP_SYNC_KEY,  sync_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_AUTO_SCROLL_KEY, auto_scroll_cb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_COUNT_CB_KEY, count_cb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_COUNT_SB_KEY, count_sb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_FILESIZE_CB_KEY, filesize_cb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_FILESIZE_SB_KEY, filesize_sb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_FILESIZE_LB_KEY, filesize_lb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_DURATION_CB_KEY,  duration_cb);
-  OBJECT_SET_DATA(cap_open_w, E_CAP_DURATION_SB_KEY,  duration_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_HIDE_INFO_KEY, hide_info_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_CB_KEY, stop_packets_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_SB_KEY, stop_packets_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_PACKETS_LB_KEY, stop_packets_lb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_CB_KEY, stop_filesize_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_SB_KEY, stop_filesize_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILESIZE_OM_KEY, stop_filesize_om);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_CB_KEY,  stop_duration_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_SB_KEY,  stop_duration_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_DURATION_OM_KEY,  stop_duration_om);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_CB_KEY, stop_files_cb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_SB_KEY, stop_files_sb);
+  OBJECT_SET_DATA(cap_open_w, E_CAP_STOP_FILES_LB_KEY, stop_files_lb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_M_RESOLVE_KEY,  m_resolv_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_N_RESOLVE_KEY,  n_resolv_cb);
   OBJECT_SET_DATA(cap_open_w, E_CAP_T_RESOLVE_KEY,  t_resolv_cb);
@@ -608,18 +1158,14 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
      widgets. */
   capture_prep_adjust_sensitivity(NULL, cap_open_w);
 
-  /* Catch the "activate" signal on the filter and file name text
+  /* Catch the "activate" signal on the text
      entries, so that if the user types Return there, we act as if the
      "OK" button had been selected, as happens if Return is typed if some
      widget that *doesn't* handle the Return key has the input focus. */
+  dlg_set_activate(GTK_COMBO(if_cb)->entry, ok_bt);
   dlg_set_activate(filter_te, ok_bt);
   dlg_set_activate(file_te, ok_bt);
 
-  /* Catch the "key_press_event" signal in the window, so that we can catch
-     the ESC key being pressed and act as if the "Cancel" button had
-     been selected. */
-  dlg_set_cancel(cap_open_w, cancel_bt);
-
   /* XXX - why does not
 
      gtk_widget_grab_focus(if_cb);
@@ -643,182 +1189,216 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     in it; and it now appears that you simply *can't* make a combo box
     get the initial focus, at least not in the obvious fashion. Sigh.... */
 
-  gtk_widget_show(cap_open_w);
-}
-
-static void
-capture_prep_file_cb(GtkWidget *w, gpointer file_te)
-{
-  GtkWidget *caller = gtk_widget_get_toplevel(w);
-  GtkWidget *fs;
-
-  /* Has a file selection dialog box already been opened for that top-level
-     widget? */
-  fs = OBJECT_GET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY);
-
-  if (fs != NULL) {
-    /* Yes.  Just re-activate that dialog box. */
-    reactivate_window(fs);
-    return;
-  }
+  SIGNAL_CONNECT(cap_open_w, "delete_event", window_delete_event_cb, NULL);
+  SIGNAL_CONNECT(cap_open_w, "destroy", capture_prep_destroy_cb, NULL);
 
-  fs = gtk_file_selection_new ("Ethereal: Capture File");
+  /* Give the initial focus to the "Filter" entry box. */
+  gtk_widget_grab_focus(filter_te);
 
-  /* If we've opened a file, start out by showing the files in the directory
-     in which that file resided. */
-  if (last_open_dir)
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fs), last_open_dir);
+  gtk_widget_show_all(cap_open_w);
+  window_present(cap_open_w);
+}
 
-  OBJECT_SET_DATA(fs, E_CAP_FILE_TE_KEY, file_te);
+/* everythings prepared, now it's really time to start the capture */
+void
+capture_start_confirmed(void) {
+
+
+    /* init iface, if never used before */
+    /* XXX - would better be doing this in main.c */
+    if(capture_opts->iface == NULL) {
+        gchar *if_device;
+        gchar *if_name;
+
+        /* did the user ever selected a capture interface before? */
+        if(prefs.capture_device == NULL) {
+            simple_dialog(ESD_TYPE_CONFIRMATION,
+                        ESD_BTN_OK,
+                        PRIMARY_TEXT_START "No capture interface selected!" PRIMARY_TEXT_END "\n\n"
+                        "To select an interface use:\n\n"
+                        "Capture->Options (until Ethereal is stopped)\n"
+                        "Edit->Preferences/Capture (permanent, if saved)");
+            return;
+        }
+        if_device = g_strdup(prefs.capture_device);
+        if_name = get_if_name(if_device);
+        capture_opts->iface = g_strdup(if_name);
+
+        g_free(if_device);
+    }
 
-  /* Set the E_FS_CALLER_PTR_KEY for the new dialog to point to our caller. */
-  OBJECT_SET_DATA(fs, E_FS_CALLER_PTR_KEY, caller);
+    /* XXX - we might need to init other pref data as well... */
 
-  /* Set the E_FILE_SEL_DIALOG_PTR_KEY for the caller to point to us */
-  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, fs);
+    if (capture_start(capture_opts)) {
+        /* The capture succeeded, which means the capture filter syntax is
+        valid; add this capture filter to the recent capture filter list. */
+        cfilter_combo_add_recent(capture_opts->cfilter);
+    }
+}
 
-  /* Call a handler when the file selection box is destroyed, so we can inform
-     our caller, if any, that it's been destroyed. */
-  SIGNAL_CONNECT(fs, "destroy", cap_prep_fs_destroy_cb, file_te);
+/* user confirmed the "Save capture file..." dialog */
+static void
+capture_start_answered_cb(gpointer dialog _U_, gint btn, gpointer data)
+{
+    switch(btn) {
+    case(ESD_BTN_SAVE):
+        /* save file first */
+        file_save_as_cmd(after_save_capture_dialog, data);
+        break;
+    case(ESD_BTN_DONT_SAVE):
+        /* XXX - unlink old file? */
+        /* start the capture */
+        capture_start_confirmed();
+        break;
+    case(ESD_BTN_CANCEL):
+        break;
+    default:
+        g_assert_not_reached();
+    }
+}
 
-  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->ok_button, "clicked", cap_prep_fs_ok_cb, fs);
+/* user pressed the "Start" button (in dialog or toolbar) */
+void
+capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
+{
+  gpointer  dialog;
 
-  /* Connect the cancel_button to destroy the widget */
-  SIGNAL_CONNECT(GTK_FILE_SELECTION(fs)->cancel_button, "clicked", cap_prep_fs_cancel_cb,
-                 fs);
 
-  /* Catch the "key_press_event" signal in the window, so that we can catch
-     the ESC key being pressed and act as if the "Cancel" button had
-     been selected. */
-  dlg_set_cancel(fs, GTK_FILE_SELECTION(fs)->cancel_button);
+  /* get the values and close the options dialog */
+  if(cap_open_w) {
+    capture_dlg_prep(cap_open_w);
+    window_destroy(GTK_WIDGET(cap_open_w));
+  }
 
-  gtk_widget_show(fs);
+  if((cfile.state != FILE_CLOSED) && !cfile.user_saved && prefs.gui_ask_unsaved) {
+    /* user didn't saved his current file, ask him */
+    dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE_CANCEL,
+                PRIMARY_TEXT_START "Save capture file before starting a new capture?" PRIMARY_TEXT_END "\n\n"
+                "If you start a new capture without saving, your current capture data will\nbe discarded.");
+    simple_dialog_set_cb(dialog, capture_start_answered_cb, NULL);
+  } else {
+    /* unchanged file, just capture a new one */
+    capture_start_confirmed();
+  }
 }
 
+/* user selected a link type, convert to internal value */
 static void
-cap_prep_fs_ok_cb(GtkWidget *w _U_, gpointer data)
+select_link_type_cb(GtkWidget *w, gpointer data)
 {
-  gchar     *cf_name;
-
-  cf_name = g_strdup(gtk_file_selection_get_filename(
-    GTK_FILE_SELECTION (data)));
-
-  /* Perhaps the user specified a directory instead of a file.
-     Check whether they did. */
-  if (test_for_directory(cf_name) == EISDIR) {
-        /* It's a directory - set the file selection box to display it. */
-        set_last_open_dir(cf_name);
-        g_free(cf_name);
-        gtk_file_selection_set_filename(GTK_FILE_SELECTION(data),
-          last_open_dir);
-        return;
-  }
+  int new_linktype = GPOINTER_TO_INT(data);
+  GtkWidget *linktype_om = OBJECT_GET_DATA(w, E_CAP_LT_OM_KEY);
+  int old_linktype = GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
 
-  gtk_entry_set_text(GTK_ENTRY(OBJECT_GET_DATA(data, E_CAP_FILE_TE_KEY)), cf_name);
-
-  gtk_widget_destroy(GTK_WIDGET(data));
-  g_free(cf_name);
+  if (old_linktype != new_linktype)
+    OBJECT_SET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY, GINT_TO_POINTER(new_linktype));
 }
 
+/* user pressed "File" button */
 static void
-cap_prep_fs_cancel_cb(GtkWidget *w _U_, gpointer data)
+capture_prep_file_cb(GtkWidget *file_bt, GtkWidget *file_te)
 {
-  gtk_widget_destroy(GTK_WIDGET(data));
+    file_selection_browse(file_bt, file_te, "Ethereal: Specify a Capture File", FILE_SELECTION_WRITE_BROWSE);
 }
 
-static void
-cap_prep_fs_destroy_cb(GtkWidget *win, GtkWidget* file_te)
-{
-  GtkWidget *caller;
-
-  /* Get the widget that requested that we be popped up.
-     (It should arrange to destroy us if it's destroyed, so
-     that we don't get a pointer to a non-existent window here.) */
-  caller = OBJECT_GET_DATA(win, E_FS_CALLER_PTR_KEY);
-
-  /* Tell it we no longer exist. */
-  OBJECT_SET_DATA(caller, E_FILE_SEL_DIALOG_PTR_KEY, NULL);
-
-  /* Now nuke this window. */
-  gtk_grab_remove(GTK_WIDGET(win));
-  gtk_widget_destroy(GTK_WIDGET(win));
-
-  /* Give the focus to the file text entry widget so the user can just press
-     Return to start the capture. */
-  gtk_widget_grab_focus(file_te);
-}
 
+/* convert dialog settings into capture_opts values */
 static void
-capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
-  GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te,
-            *file_te, *ringbuffer_on_tb, *ringbuffer_nbf_sb,
-            *sync_cb, *auto_scroll_cb,
-            *count_cb, *count_sb,
-            *filesize_cb, *filesize_sb,
-            *duration_cb, *duration_sb,
-            *ring_duration_cb, *ring_duration_sb,
+capture_dlg_prep(gpointer parent_w) {
+  GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te, *filter_cm,
+            *file_te, *multi_files_on_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_cb,
+            *linktype_om, *sync_cb, *auto_scroll_cb, *hide_info_cb,
+            *stop_packets_cb, *stop_packets_sb,
+            *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+            *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+            *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+            *file_duration_cb, *file_duration_sb, *file_duration_om,
+            *stop_files_cb, *stop_files_sb,
             *m_resolv_cb, *n_resolv_cb, *t_resolv_cb;
+#ifdef _WIN32
+  GtkWidget *buffer_size_sb;
+#endif
+  gchar *entry_text;
   gchar *if_text;
   gchar *if_name;
-  gchar *filter_text;
-  gchar *save_file, *g_save_file;
+  const gchar *filter_text;
+  const gchar *g_save_file;
   gchar *cf_name;
   gchar *dirname;
+  gint32 tmp;
 
   if_cb     = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
   snap_cb   = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
   snap_sb   = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
+  linktype_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_LT_OM_KEY);
+#ifdef _WIN32
+  buffer_size_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_BUFFER_SIZE_SB_KEY);
+#endif
   promisc_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_PROMISC_KEY);
-  filter_te = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILT_KEY);
+  filter_cm = OBJECT_GET_DATA(top_level, E_CFILTER_CM_KEY);
+  filter_te = GTK_COMBO(filter_cm)->entry;
   file_te   = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_TE_KEY);
-  ringbuffer_on_tb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_ON_TB_KEY);
+  multi_files_on_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
+  ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
   ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
-  ring_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_DURATION_CB_KEY);
-  ring_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_DURATION_SB_KEY);
+  ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
+  ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
+  ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
+  file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
+  file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
+  file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
   sync_cb   = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
   auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
-  count_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_COUNT_CB_KEY);
-  count_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_COUNT_SB_KEY);
-  filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILESIZE_CB_KEY);
-  filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILESIZE_SB_KEY);
-  duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_DURATION_CB_KEY);
-  duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_DURATION_SB_KEY);
+  hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
+  stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
+  stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
+  stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
+  stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
+  stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
+  stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
+  stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
+  stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
+  stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
+  stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
   m_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_M_RESOLVE_KEY);
   n_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_N_RESOLVE_KEY);
   t_resolv_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_T_RESOLVE_KEY);
 
-  if_text =
+  entry_text =
     g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(if_cb)->entry)));
-  /* 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,
+  if_text = g_strstrip(entry_text);
+  if_name = get_if_name(if_text);
+  if (*if_name == '\0') {
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
       "You didn't specify an interface on which to capture packets.");
-    g_free(if_text);
+    g_free(entry_text);
     return;
   }
-  if (cfile.iface)
-    g_free(cfile.iface);
-  cfile.iface = g_strdup(if_name);
-  g_free(if_text);
+  if (capture_opts->iface)
+    g_free(capture_opts->iface);
+  capture_opts->iface = g_strdup(if_name);
+  g_free(entry_text);
 
-  capture_opts.has_snaplen =
+  capture_opts->linktype =
+      GPOINTER_TO_INT(OBJECT_GET_DATA(linktype_om, E_CAP_OM_LT_VALUE_KEY));
+
+#ifdef _WIN32
+  capture_opts->buffer_size =
+    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffer_size_sb));
+#endif
+
+  capture_opts->has_snaplen =
     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb));
-  if (capture_opts.has_snaplen) {
-    capture_opts.snaplen =
+  if (capture_opts->has_snaplen) {
+    capture_opts->snaplen =
       gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(snap_sb));
-    if (capture_opts.snaplen < 1)
-      capture_opts.snaplen = WTAP_MAX_PACKET_SIZE;
-    else if (capture_opts.snaplen < MIN_PACKET_SIZE)
-      capture_opts.snaplen = MIN_PACKET_SIZE;
+    if (capture_opts->snaplen < 1)
+      capture_opts->snaplen = WTAP_MAX_PACKET_SIZE;
+    else if (capture_opts->snaplen < MIN_PACKET_SIZE)
+      capture_opts->snaplen = MIN_PACKET_SIZE;
   }
 
-  capture_opts.promisc_mode =
+  capture_opts->promisc_mode =
     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(promisc_cb));
 
   /* XXX - don't try to get clever and set "cfile.filter" to NULL if the
@@ -830,15 +1410,15 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
      no filter is set, which means no packets arrive as input on that
      socket, which means Ethereal never sees any packets. */
   filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te));
-  if (cfile.cfilter)
-    g_free(cfile.cfilter);
+  if (capture_opts->cfilter)
+    g_free(capture_opts->cfilter);
   g_assert(filter_text != NULL);
-  cfile.cfilter = g_strdup(filter_text);
+  capture_opts->cfilter = g_strdup(filter_text);
 
   g_save_file = gtk_entry_get_text(GTK_ENTRY(file_te));
   if (g_save_file && g_save_file[0]) {
     /* User specified a file to which the capture should be written. */
-    save_file = g_strdup(g_save_file);
+    capture_opts->save_file = g_strdup(g_save_file);
     /* Save the directory name for future file dialogs. */
     cf_name = g_strdup(g_save_file);
     dirname = get_dirname(cf_name);  /* Overwrites cf_name */
@@ -846,85 +1426,126 @@ capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) {
     g_free(cf_name);
   } else {
     /* User didn't specify a file; save to a temporary file. */
-    save_file = NULL;
+    capture_opts->save_file = NULL;
+  }
+
+  capture_opts->has_autostop_packets =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb));
+  if (capture_opts->has_autostop_packets)
+    capture_opts->autostop_packets =
+      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_packets_sb));
+
+  capture_opts->has_autostop_duration =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb));
+  if (capture_opts->has_autostop_duration) {
+    capture_opts->autostop_duration =
+      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_duration_sb));
+    capture_opts->autostop_duration =
+      time_unit_option_menu_get_value(stop_duration_om, capture_opts->autostop_duration);
   }
 
-  capture_opts.has_autostop_count =
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(count_cb));
-  if (capture_opts.has_autostop_count)
-    capture_opts.autostop_count =
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(count_sb));
-
-  capture_opts.has_autostop_filesize =
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filesize_cb));
-  if (capture_opts.has_autostop_filesize)
-    capture_opts.autostop_filesize =
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(filesize_sb));
-
-  capture_opts.has_autostop_duration =
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(duration_cb));
-  if (capture_opts.has_autostop_duration)
-    capture_opts.autostop_duration =
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(duration_sb));
-
-  capture_opts.sync_mode =
+  capture_opts->real_time_mode =
     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb));
 
   auto_scroll_live =
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_scroll_cb));
 
-  g_resolv_flags = RESOLV_NONE;
+  capture_opts->show_info =
+      !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(hide_info_cb));
+
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_resolv_cb)))
     g_resolv_flags |= RESOLV_MAC;
+  else
+    g_resolv_flags &= ~RESOLV_MAC;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(n_resolv_cb)))
     g_resolv_flags |= RESOLV_NETWORK;
+  else
+    g_resolv_flags &= ~RESOLV_NETWORK;
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t_resolv_cb)))
     g_resolv_flags |= RESOLV_TRANSPORT;
+  else
+    g_resolv_flags &= ~RESOLV_TRANSPORT;
 
-  capture_opts.ringbuffer_on =
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb)) &&
-       !(capture_opts.sync_mode);
-  if (capture_opts.ringbuffer_on) {
-    if (save_file == NULL) {
-      simple_dialog(ESD_TYPE_CRIT, NULL,
-        "You must specify a save file if you want to use the ring buffer.");
-      return;
-    } else if (!capture_opts.has_autostop_filesize) {
-      simple_dialog(ESD_TYPE_CRIT, NULL,
-        "You must specify a file size at which to rotate the capture files\n"
-        "if you want to use the ring buffer.");
-      g_free(save_file);
-      return;
-    }
-  }
+  capture_opts->has_ring_num_files =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb));
 
-  capture_opts.ringbuffer_num_files =
+  capture_opts->ring_num_files =
     gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ringbuffer_nbf_sb));
-  if (capture_opts.ringbuffer_num_files < RINGBUFFER_MIN_NUM_FILES)
-    capture_opts.ringbuffer_num_files = RINGBUFFER_MIN_NUM_FILES;
-  else if (capture_opts.ringbuffer_num_files > RINGBUFFER_MAX_NUM_FILES)
-    capture_opts.ringbuffer_num_files = RINGBUFFER_MAX_NUM_FILES;
-
-  capture_opts.has_ring_duration =
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_duration_cb));
-  if (capture_opts.has_ring_duration)
-    capture_opts.ringbuffer_duration =
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ring_duration_sb));
-
-  gtk_widget_destroy(GTK_WIDGET(parent_w));
-
-  do_capture(save_file);
-  if (save_file != NULL)
-    g_free(save_file);
-}
+  if (capture_opts->ring_num_files > RINGBUFFER_MAX_NUM_FILES)
+    capture_opts->ring_num_files = RINGBUFFER_MAX_NUM_FILES;
+#if RINGBUFFER_MIN_NUM_FILES > 0
+  else if (capture_opts->ring_num_files < RINGBUFFER_MIN_NUM_FILES)
+    capture_opts->ring_num_files = RINGBUFFER_MIN_NUM_FILES;
+#endif
 
-static void
-capture_prep_close_cb(GtkWidget *close_bt _U_, gpointer parent_w)
-{
-  gtk_grab_remove(GTK_WIDGET(parent_w));
-  gtk_widget_destroy(GTK_WIDGET(parent_w));
+  capture_opts->multi_files_on =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb));
+
+  capture_opts->has_file_duration =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb));
+  if (capture_opts->has_file_duration) {
+    capture_opts->file_duration =
+      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(file_duration_sb));
+    capture_opts->file_duration =
+      time_unit_option_menu_get_value(file_duration_om, capture_opts->file_duration);
+  }
+
+  capture_opts->has_autostop_files =
+    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb));
+  if (capture_opts->has_autostop_files)
+    capture_opts->autostop_files =
+      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_files_sb));
+
+  if (capture_opts->multi_files_on) {
+    capture_opts->has_autostop_filesize =
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb));
+    if (capture_opts->has_autostop_filesize) {
+      tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ring_filesize_sb));
+      tmp = size_unit_option_menu_convert_value(ring_filesize_om, tmp);
+      if(tmp != 0) {
+        capture_opts->autostop_filesize = tmp;
+      } else {
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+          PRIMARY_TEXT_START "Multiple files: Requested filesize too large!\n\n" PRIMARY_TEXT_END
+          "The setting \"Next file every x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+        return;
+      }
+    }
+
+    /* test if the settings are ok for a ringbuffer */
+    if (capture_opts->save_file == NULL) {
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+        PRIMARY_TEXT_START "Multiple files: No capture file name given!\n\n" PRIMARY_TEXT_END
+        "You must specify a filename if you want to use multiple files.");
+      return;
+    } else if (!capture_opts->has_autostop_filesize && !capture_opts->has_file_duration) {
+      simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+        PRIMARY_TEXT_START "Multiple files: No file limit given!\n\n" PRIMARY_TEXT_END
+        "You must specify a file size or duration at which is switched to the next capture file\n"
+        "if you want to use multiple files.");
+      g_free(capture_opts->save_file);
+      capture_opts->save_file = NULL;
+      return;
+    }
+  } else {
+    capture_opts->has_autostop_filesize =
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb));
+    if (capture_opts->has_autostop_filesize) {
+      tmp = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(stop_filesize_sb));
+      tmp = size_unit_option_menu_convert_value(stop_filesize_om, tmp);
+      if(tmp != 0) {
+        capture_opts->autostop_filesize = tmp;
+      } else {
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
+          PRIMARY_TEXT_START "Stop Capture: Requested filesize too large!\n\n" PRIMARY_TEXT_END
+          "The setting \"... after x byte(s)\" can't be greater than %u bytes (2GB).", G_MAXINT);
+        return;
+      }
+    }
+  } /* multi_files_on */
 }
 
+/* user requested to destroy the dialog */
 static void
 capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_)
 {
@@ -936,13 +1557,22 @@ capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_)
 
   if (fs != NULL) {
     /* Yes.  Destroy it. */
-    gtk_widget_destroy(fs);
+    window_destroy(fs);
   }
 
   /* Note that we no longer have a "Capture Options" dialog box. */
   cap_open_w = NULL;
 }
 
+/* user changed the interface entry */
+static void
+capture_prep_interface_changed_cb(GtkWidget *entry, gpointer argp)
+{
+  GtkWidget *linktype_om = argp;
+
+  set_link_type_list(linktype_om, entry);
+}
+
 /*
  * Adjust the sensitivity of various widgets as per the current setting
  * of other widgets.
@@ -950,109 +1580,160 @@ capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_)
 static void
 capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w)
 {
-  GtkWidget *snap_cb, *snap_sb,
-            *ringbuffer_on_tb, *ringbuffer_nbf_lb, *ringbuffer_nbf_sb,
-            *sync_cb, *auto_scroll_cb,
-            *count_cb, *count_sb,
-            *filesize_cb, *filesize_sb, *filesize_lb,
-           *duration_cb, *duration_sb,
-           *ring_duration_cb, *ring_duration_sb;
-
+  GtkWidget *if_cb,
+            *snap_cb, *snap_sb,
+            *multi_files_on_cb, *ringbuffer_nbf_cb, *ringbuffer_nbf_sb, *ringbuffer_nbf_lb,
+            *ring_filesize_cb, *ring_filesize_sb, *ring_filesize_om,
+            *file_duration_cb, *file_duration_sb, *file_duration_om,
+            *sync_cb, *auto_scroll_cb, *hide_info_cb,
+            *stop_packets_cb, *stop_packets_sb, *stop_packets_lb,
+            *stop_filesize_cb, *stop_filesize_sb, *stop_filesize_om,
+            *stop_duration_cb, *stop_duration_sb, *stop_duration_om,
+            *stop_files_cb, *stop_files_sb, *stop_files_lb;
+
+
+  if_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_IFACE_KEY);
   snap_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_CB_KEY);
   snap_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SNAP_SB_KEY);
-  ringbuffer_on_tb  = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_ON_TB_KEY);
-  ringbuffer_nbf_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_LB_KEY);
+  multi_files_on_cb  = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_MULTI_FILES_ON_CB_KEY);
+  ringbuffer_nbf_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_CB_KEY);
   ringbuffer_nbf_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_SB_KEY);
-  ring_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_DURATION_CB_KEY);
-  ring_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_DURATION_SB_KEY);
+  ringbuffer_nbf_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_NBF_LB_KEY);
+  ring_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_CB_KEY);
+  ring_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_SB_KEY);
+  ring_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_RING_FILESIZE_OM_KEY);
+  file_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_CB_KEY);
+  file_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_SB_KEY);
+  file_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILE_DURATION_OM_KEY);
   sync_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_SYNC_KEY);
   auto_scroll_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_AUTO_SCROLL_KEY);
-  count_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_COUNT_CB_KEY);
-  count_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_COUNT_SB_KEY);
-  filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILESIZE_CB_KEY);
-  filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILESIZE_SB_KEY);
-  filesize_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_FILESIZE_LB_KEY);
-  duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_DURATION_CB_KEY);
-  duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_DURATION_SB_KEY);
-
-  /* The snapshot length spinbox is sensitive iff the "Limit each packet
+  hide_info_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_HIDE_INFO_KEY);
+  stop_packets_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_CB_KEY);
+  stop_packets_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_SB_KEY);
+  stop_packets_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_PACKETS_LB_KEY);
+  stop_filesize_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_CB_KEY);
+  stop_filesize_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_SB_KEY);
+  stop_filesize_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILESIZE_OM_KEY);
+  stop_duration_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_CB_KEY);
+  stop_duration_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_SB_KEY);
+  stop_duration_om = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_DURATION_OM_KEY);
+  stop_files_cb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_CB_KEY);
+  stop_files_sb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_SB_KEY);
+  stop_files_lb = (GtkWidget *) OBJECT_GET_DATA(parent_w, E_CAP_STOP_FILES_LB_KEY);
+
+  /* The snapshot length spinbox is sensitive if the "Limit each packet
      to" checkbox is on. */
   gtk_widget_set_sensitive(GTK_WIDGET(snap_sb),
       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(snap_cb)));
 
+
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sync_cb))) {
     /* "Update list of packets in real time" captures enabled; we don't
        support ring buffer mode for those captures, so turn ring buffer
        mode off if it's on, and make its toggle button, and the spin
        button for the number of ring buffer files (and the spin button's
        label), insensitive. */
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb))) {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb), FALSE);
-    }
-    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_on_tb), FALSE);
+/*    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(multi_files_on_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), FALSE);*/
 
     /* Auto-scroll mode is meaningful only in "Update list of packets
        in real time" captures, so make its toggle button sensitive. */
     gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), TRUE);
+
+    /*gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), TRUE);*/
   } else {
     /* "Update list of packets in real time" captures disabled; that
        means ring buffer mode is OK, so make its toggle button
        sensitive. */
-    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_on_tb), TRUE);
+/*    gtk_widget_set_sensitive(GTK_WIDGET(multi_files_on_cb), TRUE);*/
 
     /* Auto-scroll mode is meaningful only in "Update list of packets
        in real time" captures, so make its toggle button insensitive. */
     gtk_widget_set_sensitive(GTK_WIDGET(auto_scroll_cb), FALSE);
+
+    /*gtk_widget_set_sensitive(GTK_WIDGET(hide_info_cb), FALSE);*/
   }
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_on_tb))) {
-    /* Ring buffer mode enabled.  Make the spin button for the number
-       of ring buffer files, and its label, sensitive. */
-    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb), TRUE);
-    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb), TRUE);
-    gtk_widget_set_sensitive(GTK_WIDGET(ring_duration_cb), TRUE);
-
-    /* Also, indicate that the file size is a size at which to switch
-       ring buffer files, not a size at which to stop the capture,
-       turn its button on. */
-    gtk_label_set_text(GTK_LABEL(GTK_BIN(filesize_cb)->child),
-        "Rotate capture file every");
-    gtk_label_set_text(GTK_LABEL(filesize_lb), "kilobyte(s)");
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(filesize_cb), TRUE);
+  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(multi_files_on_cb))) {
+    /* Ring buffer mode enabled. */
+
+    /* Force at least one of the "file switch" conditions (we need at least one) */
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)) == FALSE &&
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)) == FALSE) {
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ring_filesize_cb), TRUE);
+    }
+
+    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
+    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ringbuffer_nbf_cb)));
+
+    /* The ring filesize spinbox is sensitive if the "Next capture file
+         after N kilobytes" checkbox is on. */
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_filesize_cb)));
+
+    /* The ring duration spinbox is sensitive if the "Next capture file
+         after N seconds" checkbox is on. */
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(file_duration_cb)));
+
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om), FALSE);
+
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_files_cb)));
   } else {
-    /* Ring buffer mode disabled.  Make the spin button for the number
-       of ring buffer files, and its label insensitive. */
-    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb), FALSE);
+    /* Ring buffer mode disabled. */
+    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_cb), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_sb), FALSE);
-    gtk_widget_set_sensitive(GTK_WIDGET(ring_duration_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(ringbuffer_nbf_lb), FALSE);
 
-    /* Also, indicate that the file size is a size at which to stop the
-       capture, not a size at which to switch ring buffer files. */
-    gtk_label_set_text(GTK_LABEL(GTK_BIN(filesize_cb)->child),
-        "Stop capture after");
-    gtk_label_set_text(GTK_LABEL(filesize_lb), "kilobyte(s) captured");
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_sb),FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(ring_filesize_om),FALSE);
+
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_sb),FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(file_duration_om),FALSE);
+
+    /* The maximum file size spinbox is sensitive if the "Stop capture
+         after N kilobytes" checkbox is on. */
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_cb), TRUE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_sb),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_filesize_om),
+          gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_filesize_cb)));
+
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_cb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_sb), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(stop_files_lb), FALSE);
   }
 
-  /* The maximum packet count spinbox is sensitive iff the "Stop capture
-     after N packets captured" checkbox is on. */
-  gtk_widget_set_sensitive(GTK_WIDGET(count_sb),
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(count_cb)));
-
-  /* The maximum file size spinbox is sensitive iff the "Stop capture
-     after N kilobytes captured" checkbox is on. */
-  gtk_widget_set_sensitive(GTK_WIDGET(filesize_sb),
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filesize_cb)));
+  /* The maximum packet count spinbox is sensitive if the "Stop capture
+     after N packets" checkbox is on. */
+  gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_sb),
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
+  gtk_widget_set_sensitive(GTK_WIDGET(stop_packets_lb),
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_packets_cb)));
 
-  /* The capture duration spinbox is sensitive iff the "Stop capture
+  /* The capture duration spinbox is sensitive if the "Stop capture
      after N seconds" checkbox is on. */
-  gtk_widget_set_sensitive(GTK_WIDGET(duration_sb),
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(duration_cb)));
-
-  /* The ring duration spinbox is sensitive if the "Rotate capture file
-     after N seconds" checkbox is on. */
-  gtk_widget_set_sensitive(GTK_WIDGET(ring_duration_sb),
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ring_duration_cb)));
-
+  gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_sb),
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
+  gtk_widget_set_sensitive(GTK_WIDGET(stop_duration_om),
+      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(stop_duration_cb)));
 }
 
 #endif /* HAVE_LIBPCAP */