show the number of packets captured, if "Update list of packets ..." isn't used

svn path=/trunk/; revision=17071

1 files changed, 24 insertions, 4 deletions

diff --git a/gtk/main.c b/gtk/main.c
index bd19ddf690..0716ff9201 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1608,7 +1608,7 @@ main_cf_cb_live_capture_fixed_started(capture_options *capture_opts)
         (capture_opts->save_file) ? capture_opts->save_file : "");
 
     statusbar_push_file_msg(capture_msg);
-    gtk_statusbar_push(GTK_STATUSBAR(packets_bar), packets_ctx, " <capturing>");
+    gtk_statusbar_push(GTK_STATUSBAR(packets_bar), packets_ctx, " P: 0");
 
     g_free(capture_msg);
 
@@ -1617,6 +1617,22 @@ main_cf_cb_live_capture_fixed_started(capture_options *capture_opts)
 }
 
 static void
+main_cf_cb_live_capture_fixed_continue(capture_file *cf)
+{
+    gchar *capture_msg;
+    
+
+	gtk_statusbar_pop(GTK_STATUSBAR(packets_bar), packets_ctx);
+
+    capture_msg = g_strdup_printf(" P: %u", 
+        cf_get_packet_count(cf));
+
+    gtk_statusbar_push(GTK_STATUSBAR(packets_bar), packets_ctx, capture_msg);
+
+    g_free(capture_msg);
+}
+
+static void
 main_cf_cb_live_capture_fixed_finished(capture_file *cf _U_)
 {
 	if(stop_dlg != NULL) {
@@ -1780,13 +1796,17 @@ static void main_cf_callback(gint event, gpointer data, gpointer user_data _U_)
 		/*g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update continue");*/
         main_cf_cb_live_capture_update_continue(data);
         break;
+    case(cf_cb_live_capture_update_finished):
+		g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update finished");
+        main_cf_cb_live_capture_update_finished(data);
+        break;
     case(cf_cb_live_capture_fixed_started):
 		g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture fixed started");
         main_cf_cb_live_capture_fixed_started(data);
         break;
-    case(cf_cb_live_capture_update_finished):
-		g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update finished");
-        main_cf_cb_live_capture_update_finished(data);
+    case(cf_cb_live_capture_fixed_continue):
+		g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture update continue");
+        main_cf_cb_live_capture_fixed_continue(data);
         break;
     case(cf_cb_live_capture_fixed_finished):
 		g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_DEBUG, "Callback: capture fixed finished");