tracker r1277 - in branches/indexer-split: . data/languages po src/libstemmer src/libstemmer/src_c src/libtracker-common src/tracker-preferences src/trackerd

[mr svn gnome org]

Author: mr
Date: Thu Apr 17 15:26:25 2008
New Revision: 1277
URL: http://svn.gnome.org/viewvc/tracker?rev=1277&view=rev

Log:
Merged upstream back into our branch

Added:
   branches/indexer-split/data/languages/stopwords.hu
      - copied unchanged from r1276, /trunk/data/languages/stopwords.hu
   branches/indexer-split/po/ja.po
      - copied unchanged from r1276, /trunk/po/ja.po
   branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.c
      - copied unchanged from r1276, /trunk/src/libstemmer/src_c/stem_UTF_8_hungarian.c
   branches/indexer-split/src/libstemmer/src_c/stem_UTF_8_hungarian.h
      - copied unchanged from r1276, /trunk/src/libstemmer/src_c/stem_UTF_8_hungarian.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/languages/Makefile.am
   branches/indexer-split/po/ChangeLog
   branches/indexer-split/po/LINGUAS
   branches/indexer-split/po/th.po
   branches/indexer-split/src/libstemmer/Makefile.am
   branches/indexer-split/src/libtracker-common/tracker-language.c
   branches/indexer-split/src/tracker-preferences/tracker-preferences.glade
   branches/indexer-split/src/trackerd/tracker-email-evolution.c
   branches/indexer-split/src/trackerd/tracker-email-modest.c
   branches/indexer-split/src/trackerd/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-utils.c
   branches/indexer-split/src/trackerd/tracker-utils.h
   branches/indexer-split/src/trackerd/trackerd.c

Modified: branches/indexer-split/data/languages/Makefile.am
==============================================================================
--- branches/indexer-split/data/languages/Makefile.am	(original)
+++ branches/indexer-split/data/languages/Makefile.am	Thu Apr 17 15:26:25 2008
@@ -7,6 +7,7 @@
 	stopwords.es 	\
 	stopwords.fi 	\
 	stopwords.fr 	\
+	stopwords.hu	\
 	stopwords.it 	\
 	stopwords.nb 	\
 	stopwords.nl 	\

Modified: branches/indexer-split/po/LINGUAS
==============================================================================
--- branches/indexer-split/po/LINGUAS	(original)
+++ branches/indexer-split/po/LINGUAS	Thu Apr 17 15:26:25 2008
@@ -19,6 +19,7 @@
 he
 hu
 it
+ja
 ko
 lt
 mk

Modified: branches/indexer-split/src/libstemmer/Makefile.am
==============================================================================
--- branches/indexer-split/src/libstemmer/Makefile.am	(original)
+++ branches/indexer-split/src/libstemmer/Makefile.am	Thu Apr 17 15:26:25 2008
@@ -11,6 +11,7 @@
 	src_c/stem_UTF_8_finnish.c \
 	src_c/stem_UTF_8_french.c \
 	src_c/stem_UTF_8_german.c \
+	src_c/stem_UTF_8_hungarian.c \
 	src_c/stem_UTF_8_italian.c \
 	src_c/stem_UTF_8_norwegian.c \
 	src_c/stem_UTF_8_porter.c \
@@ -28,6 +29,7 @@
 	src_c/stem_UTF_8_finnish.h \
 	src_c/stem_UTF_8_french.h \
 	src_c/stem_UTF_8_german.h \
+	src_c/stem_UTF_8_hungarian.h \
 	src_c/stem_UTF_8_italian.h \
 	src_c/stem_UTF_8_norwegian.h \
 	src_c/stem_UTF_8_porter.h \

Modified: branches/indexer-split/src/libtracker-common/tracker-language.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-language.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-language.c	Thu Apr 17 15:26:25 2008
@@ -52,6 +52,7 @@
         { "fi", "finnish" },
         { "fr", "french" },
         { "de", "german" },
+	{ "hu", "hungarian" },
         { "it", "italian" },
         { "nb", "norwegian" },
         { "pt", "portuguese" },

Modified: branches/indexer-split/src/tracker-preferences/tracker-preferences.glade
==============================================================================
--- branches/indexer-split/src/tracker-preferences/tracker-preferences.glade	(original)
+++ branches/indexer-split/src/tracker-preferences/tracker-preferences.glade	Thu Apr 17 15:26:25 2008
@@ -213,6 +213,7 @@
 Finnish
 French
 German
+Hungarian
 Italian
 Norwegian
 Portuguese

Modified: branches/indexer-split/src/trackerd/tracker-email-evolution.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-evolution.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-evolution.c	Thu Apr 17 15:26:25 2008
@@ -1425,9 +1425,8 @@
 				email_free_mail_message (mail_msg);
 
 				if (!tracker_cache_process_events (db_con->data, TRUE)) {
-					tracker->status = STATUS_SHUTDOWN;
+					tracker_set_status (tracker, STATUS_SHUTDOWN, 0, TRUE);
 					tracker->shutdown = TRUE;
-					tracker_dbus_send_index_status_change_signal ();
 					return;
 				}
 

Modified: branches/indexer-split/src/trackerd/tracker-email-modest.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-modest.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-modest.c	Thu Apr 17 15:26:25 2008
@@ -918,9 +918,8 @@
 				email_free_mail_message (mail_msg);
 
 				if (!tracker_cache_process_events (db_con->data, TRUE)) {
-					tracker->status = STATUS_SHUTDOWN;
+					tracker_set_status (tracker, STATUS_SHUTDOWN, 0, TRUE);
 					tracker->shutdown = TRUE;
-					tracker_dbus_send_index_status_change_signal ();
 					return;
 				}
 

Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c	Thu Apr 17 15:26:25 2008
@@ -690,8 +690,7 @@
 
 				if (i > 101 && (i % 100 == 0)) {
 					if (!tracker_cache_process_events (NULL, FALSE)) {
-						tracker->status = STATUS_SHUTDOWN;
-						tracker_dbus_send_index_status_change_signal ();
+						tracker_set_status (tracker, STATUS_SHUTDOWN, 0, TRUE);
 						return;	
 					}
 				}

Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c	Thu Apr 17 15:26:25 2008
@@ -1143,7 +1143,7 @@
         tracker->index_status = INDEX_FINISHED;
         
         if (tracker->is_running && tracker->first_time_index) {
-                tracker->status = STATUS_OPTIMIZING;
+                tracker_set_status (tracker, STATUS_OPTIMIZING, 0, FALSE);
                 tracker->do_optimize = FALSE;
                 
                 tracker->first_time_index = FALSE;
@@ -1170,8 +1170,7 @@
          * sleep until awoken by a new
          * signal.
          */
-        tracker->status = STATUS_IDLE;
-        tracker_dbus_send_index_status_change_signal ();
+        tracker_set_status (tracker, STATUS_IDLE, 0, TRUE);
         
         g_cond_wait (tracker->file_thread_signal, 
                      tracker->files_signal_mutex);
@@ -1493,16 +1492,12 @@
 		db_con = tracker->index_db;
 
 		if (!tracker_cache_process_events (tracker->index_db, TRUE) ) {
-			tracker->status = STATUS_SHUTDOWN;
-			tracker_dbus_send_index_status_change_signal ();
+			tracker_set_status (tracker, STATUS_SHUTDOWN, 0, TRUE);
 			break;	
 		}
 
-		if (tracker->status != STATUS_INDEXING) {
-			tracker->status = STATUS_INDEXING;
-			tracker_dbus_send_index_status_change_signal ();
-		}
-						
+		tracker_set_status (tracker, STATUS_INDEXING, 0, TRUE);
+
 		info = g_async_queue_try_pop (tracker->file_process_queue);
 
 		/* Check pending table if we haven't got anything */
@@ -1535,7 +1530,7 @@
 			if (result_set) {
 				gboolean valid = TRUE;
 
-				tracker->status = STATUS_PENDING;
+				tracker_set_status (tracker, STATUS_PENDING, 0, FALSE);
 
 				while (valid) {
 					FileInfo	    *info_tmp;
@@ -1581,7 +1576,7 @@
 			continue;
 		}
 
-		tracker->status = STATUS_INDEXING;
+		tracker_set_status (tracker, STATUS_INDEXING, 0, TRUE);
 
                 if (process_action_prechecks (tracker, info)) {
                         continue;

Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c	Thu Apr 17 15:26:25 2008
@@ -2621,7 +2621,16 @@
 
 }
 
+void
+tracker_set_status (Tracker *tracker, TrackerStatus status, gdouble percentage, gboolean signal)
+{
+	TrackerStatus old = tracker->status;
+
+	tracker->status = status;
 
+	if (signal && old != status)
+		tracker_dbus_send_index_status_change_signal ();
+}
 
 gboolean
 tracker_pause (void)

Modified: branches/indexer-split/src/trackerd/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.h	Thu Apr 17 15:26:25 2008
@@ -539,4 +539,6 @@
 gboolean	tracker_low_diskspace		(void);
 gboolean	tracker_pause			(void);
 
+void		tracker_set_status		(Tracker *tracker, TrackerStatus status, gdouble percentage, gboolean signal);
+
 #endif

Modified: branches/indexer-split/src/trackerd/trackerd.c
==============================================================================
--- branches/indexer-split/src/trackerd/trackerd.c	(original)
+++ branches/indexer-split/src/trackerd/trackerd.c	Thu Apr 17 15:26:25 2008
@@ -210,7 +210,7 @@
 {
         GSList *black_list;
 
-	tracker->status = STATUS_SHUTDOWN;
+	tracker_set_status (tracker, STATUS_SHUTDOWN, 0, FALSE);
 
 	if (sig_msg) {
 		tracker_log ("Received signal '%s' so now shutting down", sig_msg);
@@ -743,7 +743,7 @@
 
 	add_local_dbus_connection_monitoring (tracker->dbus_con);
 
-	tracker->status = STATUS_INIT;
+	tracker_set_status (tracker, STATUS_INIT, 0, FALSE);
 
  	tracker->is_running = FALSE;
 	tracker->shutdown = FALSE;