aboutsummaryrefslogtreecommitdiffstats
path: root/capture.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-02-07 02:09:30 +0000
committerGuy Harris <guy@alum.mit.edu>2005-02-07 02:09:30 +0000
commit79a39eddbcafe32d8c7f4b6964fbad8e7956a48c (patch)
tree7b7ebbb6ffea413265f3b492fc53d91089d95242 /capture.c
parent641106f21de7c2bb6e83ea9ba62ea2f8d69c04fa (diff)
Move the code to set the title on a window when a capture is in progress
to the "start live capture" callback, and call that from "do_capture()". When opening a capture file, don't pop up the "What do you want to do?" pane when closing any existing file you have open, as we're just going to put the regular view up right after that. svn path=/trunk/; revision=13332
Diffstat (limited to 'capture.c')
-rw-r--r--capture.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/capture.c b/capture.c
index 38cf2092a1..f1cf38c5eb 100644
--- a/capture.c
+++ b/capture.c
@@ -414,27 +414,23 @@ do_capture(capture_options *capture_opts)
{
gboolean is_tempfile;
gboolean ret;
- gchar *title;
/* open the output file (temporary/specified name/ringbuffer) and close the old one */
if(!capture_open_output(capture_opts, &is_tempfile)) {
return FALSE;
}
- title = g_strdup_printf("%s: Capturing - Ethereal",
- get_interface_descriptive_name(capture_opts->iface));
if (capture_opts->sync_mode) {
/* sync mode: do the capture in a child process */
ret = sync_pipe_do_capture(capture_opts, is_tempfile);
/* capture is still running */
- set_main_window_name(title);
+ cf_callback_invoke(cf_cb_live_capture_started, capture_opts);
} else {
/* normal mode: do the capture synchronously */
- set_main_window_name(title);
+ cf_callback_invoke(cf_cb_live_capture_started, capture_opts);
ret = normal_do_capture(capture_opts, is_tempfile);
/* capture is finished here */
}
- g_free(title);
return ret;
}