aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-04-01 17:57:20 +0000
committerGuy Harris <guy@alum.mit.edu>2013-04-01 17:57:20 +0000
commitd49404236ccd3eb0cbfc58503a562170611d25bf (patch)
tree0cd259ebf00867adc57cb7f5788a5ae6889e804f /ui
parenta62cc81d4b4051f4e4f9737fbf91fab9b3c8a5d1 (diff)
Get rid of main_capture_set_main_window_title(), as it just wraps
set_titlebar_for_capture_in_progress(); make the call directly, to make it a bit clearer when it needs to be called (which helps us do the equivalent in the Qt version). svn path=/trunk/; revision=48687
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk/main.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 62058fdd62..3bab40df69 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -1539,17 +1539,11 @@ static GList *icon_list_create(
}
static void
-main_capture_set_main_window_title(capture_options *capture_opts)
-{
- set_titlebar_for_capture_in_progress((capture_file *)capture_opts->cf);
-}
-
-static void
main_capture_cb_capture_prepared(capture_options *capture_opts)
{
static GList *icon_list = NULL;
- main_capture_set_main_window_title(capture_opts);
+ set_titlebar_for_capture_in_progress((capture_file *)capture_opts->cf);
if(icon_list == NULL) {
icon_list = icon_list_create(wsiconcap_16_pb_data, wsiconcap_32_pb_data, wsiconcap_48_pb_data, wsiconcap_64_pb_data);
@@ -1570,7 +1564,7 @@ main_capture_cb_capture_update_started(capture_options *capture_opts)
{
/* We've done this in "prepared" above, but it will be cleared while
switching to the next multiple file. */
- main_capture_set_main_window_title(capture_opts);
+ set_titlebar_for_capture_in_progress((capture_file *)capture_opts->cf);
main_set_for_capture_in_progress(TRUE);
set_capture_if_dialog_for_capture_in_progress(TRUE);