tracker r1158 - trunk/src/trackerd

[jamiemcc svn gnome org]

Author: jamiemcc
Date: Tue Feb 26 03:04:47 2008
New Revision: 1158
URL: http://svn.gnome.org/viewvc/tracker?rev=1158&view=rev

Log:
added merging progress signals

Modified:
   trunk/src/trackerd/tracker-dbus.c
   trunk/src/trackerd/tracker-indexer.c
   trunk/src/trackerd/tracker-utils.h

Modified: trunk/src/trackerd/tracker-dbus.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus.c	(original)
+++ trunk/src/trackerd/tracker-dbus.c	Tue Feb 26 03:04:47 2008
@@ -170,7 +170,14 @@
 	if (strcmp (service, "Emails") == 0) {
 		count = tracker->mbox_count;
 		processed = tracker->mbox_processed;
+		
+	} else if (strcmp (service, "Merging") == 0) {
+	
+		count = tracker->merge_count;
+		processed = tracker->merge_processed;
+	
 	} else {
+	
 		count = tracker->folders_count;
 		processed = tracker->folders_processed;
 	}

Modified: trunk/src/trackerd/tracker-indexer.c
==============================================================================
--- trunk/src/trackerd/tracker-indexer.c	(original)
+++ trunk/src/trackerd/tracker-indexer.c	Tue Feb 26 03:04:47 2008
@@ -635,6 +635,9 @@
 
 	tracker_log ("starting merge of %d indexes", index_count);
 	tracker->in_merge = TRUE;
+	tracker->merge_count = index_count;
+	tracker->merge_processed = 0;
+	tracker_dbus_send_index_progress_signal ("Merging", "");
 	
 
 	if (index_count == 2 && !final_exists) {
@@ -765,6 +768,8 @@
 
 			if (index != tracker->file_index && index != tracker->email_index) {
 				tracker_indexer_free (index, TRUE);
+				tracker->merge_processed++;
+				tracker_dbus_send_index_progress_signal ("Merging", "");	
 			}
 
 

Modified: trunk/src/trackerd/tracker-utils.h
==============================================================================
--- trunk/src/trackerd/tracker-utils.h	(original)
+++ trunk/src/trackerd/tracker-utils.h	Tue Feb 26 03:04:47 2008
@@ -354,6 +354,10 @@
 	GSList		*tmp_black_list;
 	gboolean	black_list_timer_active;
 	
+	/* progress info for merges */
+	int		merge_count;
+	int		merge_processed;
+	
 
 	/* application run time values */
 	gboolean	is_indexing;