diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-24 01:23:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-24 01:23:33 +0000 |
| commit | 2a691a0aeccb8a2b41a62bf02cbcea83c8109df4 (patch) | |
| tree | 150fa12ca8af874b398cf896e06974b5f2a882aa /gtk/capture_info_dlg.c | |
| parent | 2eb5983b4707f274f47fd2c9029f40e8a513f96b (diff) | |
Have capture_info_ui_create() and capture_info_open() take a pointer to
the capture_opts structure as an argument, rather than just a pointer to
the interface name.
Don't declare a global "capture_opts" pointer, as we don't define it any
more.
svn path=/trunk/; revision=25570
Diffstat (limited to 'gtk/capture_info_dlg.c')
| -rw-r--r-- | gtk/capture_info_dlg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index 801e96fdb0..68e7958542 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -90,7 +90,8 @@ pct(gint num, gint denom) { } static gboolean -capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data _U_) { +capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) { + capture_opts *capture_opts = data; #ifdef HAVE_AIRPCAP airpcap_set_toolbar_stop_capture(airpcap_if_active); #endif @@ -118,7 +119,7 @@ capture_info_ui_update_cb(gpointer data) /* will keep pointers to the fields in the counts parameter */ void capture_info_ui_create( capture_info *cinfo, -const gchar *iface) +capture_opts *capture_opts) { unsigned int i; GtkWidget *main_vb, *stop_bt, *counts_tb; @@ -167,7 +168,7 @@ const gchar *iface) * it might be less cryptic, but if a more descriptive name is * available, we should still use that. */ - descr = get_interface_descriptive_name(iface); + descr = get_interface_descriptive_name(capture_opts->iface); title_iface = g_strdup_printf("Wireshark: Capture from %s", descr); g_free(descr); cap_w_title = create_user_window_title(title_iface); |