tracker r1188 - in trunk/src: tracker-applet trackerd

[jamiemcc svn gnome org]

Author: jamiemcc
Date: Mon Mar  3 04:12:24 2008
New Revision: 1188
URL: http://svn.gnome.org/viewvc/tracker?rev=1188&view=rev

Log:
some minor tweakes

Modified:
   trunk/src/tracker-applet/tracker-applet-prefs.glade
   trunk/src/tracker-applet/tracker-applet.c
   trunk/src/trackerd/tracker-cache.c
   trunk/src/trackerd/tracker-dbus-methods.c
   trunk/src/trackerd/tracker-indexer.c

Modified: trunk/src/tracker-applet/tracker-applet-prefs.glade
==============================================================================
--- trunk/src/tracker-applet/tracker-applet-prefs.glade	(original)
+++ trunk/src/tracker-applet/tracker-applet-prefs.glade	Mon Mar  3 04:12:24 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.0 on Wed Feb 27 13:02:26 2008 -->
+<!--Generated with glade3 3.4.0 on Sun Mar  2 22:41:46 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="wnd_prefs">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -12,7 +12,6 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <property name="deletable">False</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -206,6 +205,7 @@
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">4</property>
             <property name="homogeneous">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
               <widget class="GtkButton" id="btn_close">
                 <property name="visible">True</property>

Modified: trunk/src/tracker-applet/tracker-applet.c
==============================================================================
--- trunk/src/tracker-applet/tracker-applet.c	(original)
+++ trunk/src/tracker-applet/tracker-applet.c	Mon Mar  3 04:12:24 2008
@@ -350,6 +350,8 @@
 		set_auto_pause (icon, FALSE);
 		return FALSE;
 	}
+	
+	dbus_g_proxy_begin_call (priv->tracker->proxy, "PromptIndexSignals", NULL, NULL, NULL, G_TYPE_INVALID);
 
         return TRUE;
 }
@@ -407,7 +409,7 @@
 	} else {
 	
 		priv->auto_pause_timer_active = FALSE;
-	
+		priv->auto_pause = FALSE;	
 		
 		tracker_set_bool_option	(priv->tracker, "Pause", FALSE, &error);
 		
@@ -852,11 +854,32 @@
 set_icon (TrayIconPrivate *priv)
 {
 	
+	if (!priv->user_pause) {
+	
+		if (priv->index_state == INDEX_IDLE) {
+	
+			priv->animated = FALSE;
+			priv->animated_timer_active = FALSE;
+			
+		 	if (priv->index_icon != ICON_DEFAULT) {
+				priv->index_icon = ICON_DEFAULT;
+				set_tracker_icon (priv);
+			}
+			
+			return FALSE;
+		}
+	
+	} 
+	
+	
 	if (priv->user_pause || priv->auto_pause || priv->pause_state != PAUSE_NONE) {
+	
+	
 		if (priv->index_icon != ICON_PAUSED) {
 			priv->index_icon = ICON_PAUSED;
 			set_tracker_icon (priv);		
 		}
+		
 		priv->animated = FALSE;
 		priv->animated_timer_active = FALSE;
 		return FALSE;
@@ -879,12 +902,6 @@
 	}
 
 	
-	if (priv->index_icon != ICON_DEFAULT) {
-		priv->index_icon = ICON_DEFAULT;
-		priv->animated = FALSE;
-		priv->animated_timer_active = FALSE;
-		set_tracker_icon (priv);
-	}
 	
 	return FALSE;
 

Modified: trunk/src/trackerd/tracker-cache.c
==============================================================================
--- trunk/src/trackerd/tracker-cache.c	(original)
+++ trunk/src/trackerd/tracker-cache.c	Mon Mar  3 04:12:24 2008
@@ -148,7 +148,7 @@
 	tracker_log ("Flushing all words - total hits in cache is %d, total words %d", tracker->word_detail_count, tracker->word_count);
 
 	/* if word count is small then flush to main index rather than a new temp index */
-	if (tracker->word_count < 5000) {
+	if (tracker->word_count < 1500) {
 	
 		index_con.file_index = tracker->file_index;
 		index_con.email_index = tracker->email_index;
@@ -173,7 +173,7 @@
 		}
 	}
 
-	if (!tracker_indexer_has_merge_files (INDEX_TYPE_FILES) && tracker->word_update_count < 10000) {
+	if (!tracker_indexer_has_merge_files (INDEX_TYPE_FILES) && tracker->word_update_count < 5000) {
 		index_con.file_update_index = tracker->file_index;
 	} else {
 		index_con.file_update_index = tracker->file_update_index;

Modified: trunk/src/trackerd/tracker-dbus-methods.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus-methods.c	(original)
+++ trunk/src/trackerd/tracker-dbus-methods.c	Mon Mar  3 04:12:24 2008
@@ -472,6 +472,8 @@
 
 	if (strcasecmp (option, "Pause") == 0) {
 		tracker->pause_manual = value;
+
+		tracker_dbus_send_index_status_change_signal ();
 		
 		if (value) {
 			tracker_log ("trackerd is paused by user");
@@ -479,7 +481,6 @@
 			tracker_log ("trackerd is unpaused by user");
 		}
 		
-		
 	} else if (strcasecmp (option, "FastMerges") == 0) {
 		tracker->fast_merges = value;
 		tracker_log ("fast merges set to %d", value);

Modified: trunk/src/trackerd/tracker-indexer.c
==============================================================================
--- trunk/src/trackerd/tracker-indexer.c	(original)
+++ trunk/src/trackerd/tracker-indexer.c	Mon Mar  3 04:12:24 2008
@@ -436,6 +436,12 @@
 
 	dpiterinit (src->word_index);
 	
+	tracker->in_merge = TRUE;
+	tracker->merge_count = 1;
+	tracker->merge_processed = 0;
+	tracker_dbus_send_index_progress_signal ("Merging", "");
+	
+	
 	while ((str = dpiternext (src->word_index, NULL))) {
 		
 		i++;
@@ -479,6 +485,11 @@
 	if (update) {
 		tracker->file_update_index = tracker_indexer_open ("file-update-index.db");
 	}
+	
+	tracker->in_merge = FALSE;
+	tracker->merge_count = 1;
+	tracker->merge_processed = 1;
+	tracker_dbus_send_index_progress_signal ("Merging", "");
 
 }
 
@@ -819,10 +830,11 @@
 	
 	g_slist_free (index_list);
 
-	tracker_dbus_send_index_status_change_signal ();
+	
 
  end_of_merging:
 	tracker->in_merge = FALSE;
+	tracker_dbus_send_index_status_change_signal ();
 	
 }