Pull the capture-session state information out of capture_opts and put

it into a separate capture_session structure.  capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).

svn path=/trunk/; revision=49493

1 files changed, 9 insertions, 9 deletions

diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c
index 870f7a2045..2ec2118fbe 100644
--- a/ui/gtk/capture_info_dlg.c
+++ b/ui/gtk/capture_info_dlg.c
@@ -72,25 +72,25 @@ typedef struct {
 
 /* Workhorse for stopping capture */
 static void
-capture_info_stop(capture_options *capture_opts)
+capture_info_stop(capture_session *cap_session)
 {
 #ifdef HAVE_AIRPCAP
   airpcap_set_toolbar_stop_capture(airpcap_if_active);
 #endif
-  capture_stop(capture_opts);
+  capture_stop(cap_session);
 }
 
 /* "delete-event" signal callback. Note different signature than "clicked" signal callback */
 static gboolean
 capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) {
-  capture_info_stop((capture_options *)data);
+  capture_info_stop((capture_session *)data);
   return TRUE;
 }
 
 /* "clicked" signal callback */
 static void
 capture_info_stop_clicked_cb(GtkButton *w _U_, gpointer data) {
-  capture_info_stop((capture_options *)data);
+  capture_info_stop((capture_session *)data);
 }
 
 static gboolean
@@ -110,10 +110,10 @@ capture_info_ui_update_cb(gpointer data)
 
 /* create the capture info dialog */
 /* will keep pointers to the fields in the counts parameter */
-void capture_info_ui_create(
-capture_info    *cinfo,
-capture_options *capture_opts)
+void
+capture_info_ui_create(capture_info *cinfo, capture_session *cap_session)
 {
+  capture_options  *capture_opts = cap_session->capture_opts;
   unsigned int      i;
   GtkWidget         *main_vb, *stop_bt, *counts_grid;
   GtkWidget         *counts_fr, *running_grid, *running_label, *lb, *bbox, *ci_help;
@@ -297,8 +297,8 @@ capture_options *capture_opts)
 
   stop_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CAPTURE_STOP);
   window_set_cancel_button(info->cap_w, stop_bt, NULL);
-  g_signal_connect(stop_bt, "clicked", G_CALLBACK(capture_info_stop_clicked_cb), capture_opts);
-  g_signal_connect(info->cap_w, "delete_event", G_CALLBACK(capture_info_delete_cb), capture_opts);
+  g_signal_connect(stop_bt, "clicked", G_CALLBACK(capture_info_stop_clicked_cb), cap_session);
+  g_signal_connect(info->cap_w, "delete_event", G_CALLBACK(capture_info_delete_cb), cap_session);
 
   ci_help = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
   gtk_widget_set_tooltip_text(ci_help, "Get help about this dialog");