GNOME.org
 

tracker r1323 - in branches/indexer-split: . data src/libtracker src/trackerd

Author: mr
Date: Tue Apr 29 08:40:10 2008
New Revision: 1323
URL: http://svn.gnome.org/viewvc/tracker?rev=1323&view=rev

Log:


Added:
   branches/indexer-split/data/tracker-dbus-daemon.xml
      - copied unchanged from r1322, /branches/indexer-split/data/tracker-dbus-tracker-daemon.xml
   branches/indexer-split/data/tracker-dbus-files.xml
      - copied unchanged from r1322, /branches/indexer-split/data/tracker-dbus-tracker-files.xml
   branches/indexer-split/data/tracker-dbus-keywords.xml
      - copied unchanged from r1320, /branches/indexer-split/data/tracker-dbus-keywords.xml
   branches/indexer-split/data/tracker-dbus-metadata.xml
      - copied unchanged from r1320, /branches/indexer-split/data/tracker-dbus-metadata.xml
   branches/indexer-split/data/tracker-dbus-search.xml
      - copied unchanged from r1320, /branches/indexer-split/data/tracker-dbus-search.xml
   branches/indexer-split/data/tracker-xesam-search.xml
      - copied unchanged from r1320, /branches/indexer-split/data/tracker-xesam-search.xml
   branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
   branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
   branches/indexer-split/src/trackerd/tracker-dbus-files.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-files.c
   branches/indexer-split/src/trackerd/tracker-dbus-files.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-files.h
   branches/indexer-split/src/trackerd/tracker-dbus-keywords.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.c
   branches/indexer-split/src/trackerd/tracker-dbus-keywords.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.h
   branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
   branches/indexer-split/src/trackerd/tracker-dbus-metadata.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.h
   branches/indexer-split/src/trackerd/tracker-dbus-search.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-search.c
   branches/indexer-split/src/trackerd/tracker-dbus-search.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-dbus-search.h
   branches/indexer-split/src/trackerd/tracker-xesam-search.c
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-xesam-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-search.h
      - copied unchanged from r1320, /branches/indexer-split/src/trackerd/tracker-xesam-search.h
Removed:
   branches/indexer-split/data/tracker-dbus-tracker-daemon.xml
   branches/indexer-split/data/tracker-dbus-tracker-files.xml
   branches/indexer-split/data/tracker-dbus-tracker-keywords.xml
   branches/indexer-split/data/tracker-dbus-tracker-metadata.xml
   branches/indexer-split/data/tracker-dbus-tracker-search.xml
   branches/indexer-split/data/tracker-dbus-xesam-search.xml
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.c
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.h
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.c
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.h
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.c
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.h
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.c
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.h
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.c
   branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.h
   branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.c
   branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/Makefile.am
   branches/indexer-split/src/libtracker/Makefile.am
   branches/indexer-split/src/libtracker/tracker.c
   branches/indexer-split/src/trackerd/   (props changed)
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-cache.c
   branches/indexer-split/src/trackerd/tracker-dbus.c
   branches/indexer-split/src/trackerd/tracker-email-evolution.c
   branches/indexer-split/src/trackerd/tracker-email-modest.c
   branches/indexer-split/src/trackerd/tracker-email-utils.c
   branches/indexer-split/src/trackerd/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-status.c
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-session.h
   branches/indexer-split/src/trackerd/tracker-xesam.c
   branches/indexer-split/src/trackerd/tracker-xesam.h

Modified: branches/indexer-split/data/Makefile.am
==============================================================================
--- branches/indexer-split/data/Makefile.am	(original)
+++ branches/indexer-split/data/Makefile.am	Tue Apr 29 08:40:10 2008
@@ -3,12 +3,12 @@
 configdir = $(datadir)/tracker
 
 config_DATA =					\
-	tracker-dbus-tracker-daemon.xml		\
-	tracker-dbus-tracker-files.xml		\
-	tracker-dbus-tracker-keywords.xml	\
-	tracker-dbus-tracker-metadata.xml	\
-	tracker-dbus-tracker-search.xml		\
-	tracker-dbus-xesam-search.xml		\
+	tracker-dbus-daemon.xml			\
+	tracker-dbus-files.xml			\
+	tracker-dbus-keywords.xml		\
+	tracker-dbus-metadata.xml		\
+	tracker-dbus-search.xml			\
+	tracker-xesam-search.xml		\
 		sqlite-tracker.sql \
 		sqlite-cache.sql \
 		sqlite-email.sql \

Modified: branches/indexer-split/src/libtracker/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker/Makefile.am	Tue Apr 29 08:40:10 2008
@@ -54,11 +54,11 @@
 
 # Generate DBus files from XML data.
 dbus_sources = 					\
-	tracker-dbus-tracker-daemon-glue.h	\
-	tracker-dbus-tracker-files-glue.h	\
-	tracker-dbus-tracker-keywords-glue.h	\
-	tracker-dbus-tracker-metadata-glue.h	\
-	tracker-dbus-tracker-search-glue.h
+	tracker-dbus-daemon-glue.h		\
+	tracker-dbus-files-glue.h		\
+	tracker-dbus-keywords-glue.h		\
+	tracker-dbus-metadata-glue.h		\
+	tracker-dbus-search-glue.h
 
 %-glue.h: $(top_builddir)/data/%.xml
 	$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^

Modified: branches/indexer-split/src/libtracker/tracker.c
==============================================================================
--- branches/indexer-split/src/libtracker/tracker.c	(original)
+++ branches/indexer-split/src/libtracker/tracker.c	Tue Apr 29 08:40:10 2008
@@ -19,11 +19,11 @@
 
 #include <string.h>
 
-#include "tracker-dbus-tracker-daemon-glue.h"
-#include "tracker-dbus-tracker-files-glue.h"
-#include "tracker-dbus-tracker-keywords-glue.h"
-#include "tracker-dbus-tracker-metadata-glue.h"
-#include "tracker-dbus-tracker-search-glue.h"
+#include "tracker-dbus-daemon-glue.h"
+#include "tracker-dbus-files-glue.h"
+#include "tracker-dbus-keywords-glue.h"
+#include "tracker-dbus-metadata-glue.h"
+#include "tracker-dbus-search-glue.h"
 
 #include "tracker.h"
 

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Tue Apr 29 08:40:10 2008
@@ -97,18 +97,18 @@
 	tracker-db.h							\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
-	tracker-dbus-tracker-daemon.c					\
-	tracker-dbus-tracker-daemon.h					\
-	tracker-dbus-tracker-files.c					\
-	tracker-dbus-tracker-files.h					\
-	tracker-dbus-tracker-keywords.c					\
-	tracker-dbus-tracker-keywords.h					\
-	tracker-dbus-tracker-metadata.c					\
-	tracker-dbus-tracker-metadata.h					\
-	tracker-dbus-tracker-search.c					\
-	tracker-dbus-tracker-search.h					\
-	tracker-dbus-xesam-search.c					\
-	tracker-dbus-xesam-search.h					\
+	tracker-dbus-daemon.c						\
+	tracker-dbus-daemon.h						\
+	tracker-dbus-files.c						\
+	tracker-dbus-files.h						\
+	tracker-dbus-keywords.c						\
+	tracker-dbus-keywords.h						\
+	tracker-dbus-metadata.c						\
+	tracker-dbus-metadata.h						\
+	tracker-dbus-search.c						\
+	tracker-dbus-search.h						\
+	tracker-xesam-search.c						\
+	tracker-xesam-search.h						\
 	tracker-email.c							\
 	tracker-email.h							\
 	tracker-email-utils.c						\
@@ -182,12 +182,12 @@
         tracker-marshal.c
 
 dbus_sources = 								\
-	tracker-dbus-tracker-daemon-glue.h				\
-	tracker-dbus-tracker-files-glue.h				\
-	tracker-dbus-tracker-keywords-glue.h				\
-	tracker-dbus-tracker-metadata-glue.h				\
-	tracker-dbus-tracker-search-glue.h				\
-	tracker-dbus-xesam-search-glue.h
+	tracker-dbus-daemon-glue.h					\
+	tracker-dbus-files-glue.h					\
+	tracker-dbus-keywords-glue.h					\
+	tracker-dbus-metadata-glue.h					\
+	tracker-dbus-search-glue.h					\
+	tracker-xesam-search-glue.h
 
 %-glue.h: $(top_builddir)/data/%.xml
 	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^

Modified: branches/indexer-split/src/trackerd/tracker-cache.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-cache.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-cache.c	Tue Apr 29 08:40:10 2008
@@ -29,7 +29,7 @@
 #include "tracker-utils.h"
 #include "tracker-db-sqlite.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-cache.h"
 #include "tracker-status.h"
 
@@ -311,7 +311,7 @@
         GObject  *object;
 	gboolean stopped_trans = FALSE;
 	
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 	
 	while (TRUE) {
 

Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c	Tue Apr 29 08:40:10 2008
@@ -28,18 +28,18 @@
 
 #include "tracker-db-sqlite.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
-#include "tracker-dbus-tracker-daemon-glue.h"
-#include "tracker-dbus-tracker-files.h"
-#include "tracker-dbus-tracker-files-glue.h"
-#include "tracker-dbus-tracker-keywords.h"
-#include "tracker-dbus-tracker-keywords-glue.h"
-#include "tracker-dbus-tracker-metadata.h"
-#include "tracker-dbus-tracker-metadata-glue.h"
-#include "tracker-dbus-tracker-search.h"
-#include "tracker-dbus-tracker-search-glue.h"
-#include "tracker-dbus-xesam-search.h"
-#include "tracker-dbus-xesam-search-glue.h"
+#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-daemon-glue.h"
+#include "tracker-dbus-files.h"
+#include "tracker-dbus-files-glue.h"
+#include "tracker-dbus-keywords.h"
+#include "tracker-dbus-keywords-glue.h"
+#include "tracker-dbus-metadata.h"
+#include "tracker-dbus-metadata-glue.h"
+#include "tracker-dbus-search.h"
+#include "tracker-dbus-search-glue.h"
+#include "tracker-xesam-search.h"
+#include "tracker-xesam-search-glue.h"
 
 #include "tracker-utils.h"
 #include "tracker-watch.h"
@@ -159,16 +159,16 @@
                                            DBUS_INTERFACE_DBUS);
 
         /* Set up the main tracker service */
-        if (!dbus_register_service (proxy, TRACKER_DBUS_TRACKER_DAEMON_SERVICE)) {
+        if (!dbus_register_service (proxy, TRACKER_DBUS_DAEMON_SERVICE)) {
                 return FALSE;
         }
 
         /* Add org.freedesktop.Tracker */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_TRACKER_DAEMON,
-                                             &dbus_glib_tracker_dbus_tracker_daemon_object_info,
-                                             TRACKER_DBUS_TRACKER_DAEMON_PATH))) {
+                                             TRACKER_TYPE_DBUS_DAEMON,
+                                             &dbus_glib_tracker_dbus_daemon_object_info,
+                                             TRACKER_DBUS_DAEMON_PATH))) {
                 return FALSE;
         }
 
@@ -180,9 +180,9 @@
         /* Add org.freedesktop.Tracker.Files */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_TRACKER_FILES,
-                                             &dbus_glib_tracker_dbus_tracker_files_object_info,
-                                             TRACKER_DBUS_TRACKER_FILES_PATH))) {
+                                             TRACKER_TYPE_DBUS_FILES,
+                                             &dbus_glib_tracker_dbus_files_object_info,
+                                             TRACKER_DBUS_FILES_PATH))) {
                 return FALSE;
         }
 
@@ -192,9 +192,9 @@
         /* Add org.freedesktop.Tracker.Keywords */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_TRACKER_KEYWORDS,
-                                             &dbus_glib_tracker_dbus_tracker_keywords_object_info,
-                                             TRACKER_DBUS_TRACKER_KEYWORDS_PATH))) {
+                                             TRACKER_TYPE_DBUS_KEYWORDS,
+                                             &dbus_glib_tracker_dbus_keywords_object_info,
+                                             TRACKER_DBUS_KEYWORDS_PATH))) {
                 return FALSE;
         }
 
@@ -204,9 +204,9 @@
         /* Add org.freedesktop.Tracker.Metadata */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_TRACKER_METADATA,
-                                             &dbus_glib_tracker_dbus_tracker_metadata_object_info,
-                                             TRACKER_DBUS_TRACKER_METADATA_PATH))) {
+                                             TRACKER_TYPE_DBUS_METADATA,
+                                             &dbus_glib_tracker_dbus_metadata_object_info,
+                                             TRACKER_DBUS_METADATA_PATH))) {
                 return FALSE;
         }
 
@@ -216,9 +216,9 @@
         /* Add org.freedesktop.Tracker.Search */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_TRACKER_SEARCH,
-                                             &dbus_glib_tracker_dbus_tracker_search_object_info,
-                                             TRACKER_DBUS_TRACKER_SEARCH_PATH))) {
+                                             TRACKER_TYPE_DBUS_SEARCH,
+                                             &dbus_glib_tracker_dbus_search_object_info,
+                                             TRACKER_DBUS_SEARCH_PATH))) {
                 return FALSE;
         }
 
@@ -231,9 +231,9 @@
         /* Add org.freedesktop.xesam.Search */
         if (!(object = dbus_register_object (connection, 
                                              proxy,
-                                             TRACKER_TYPE_DBUS_XESAM_SEARCH,
-                                             &dbus_glib_tracker_dbus_xesam_search_object_info,
-                                             TRACKER_DBUS_XESAM_SEARCH_PATH))) {
+                                             TRACKER_TYPE_XESAM_SEARCH,
+                                             &dbus_glib_tracker_xesam_search_object_info,
+                                             TRACKER_XESAM_SEARCH_PATH))) {
                 return FALSE;
         }
 
@@ -242,7 +242,7 @@
                            G_TYPE_STRING, G_TYPE_INVALID);
 
         dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged", 
-                  G_CALLBACK (tracker_dbus_xesam_search_name_owner_changed), 
+                  G_CALLBACK (tracker_xesam_search_name_owner_changed), 
                   g_object_ref (object),
                   name_owner_changed_done);
 

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	Tue Apr 29 08:40:10 2008
@@ -39,7 +39,7 @@
 #include "tracker-db-email.h"
 #include "tracker-cache.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-watch.h"
 #include "tracker-status.h"
 
@@ -1279,7 +1279,7 @@
                 return;
         }
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
 	if (open_summary_file (summary_file_path, &summary)) {
 		SummaryFileHeader *header;

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	Tue Apr 29 08:40:10 2008
@@ -38,7 +38,7 @@
 #include "tracker-email-utils.h"
 #include "tracker-db-email.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-cache.h"
 #include "tracker-status.h"
 #include "tracker-watch.h"
@@ -709,7 +709,7 @@
 	if (!tracker->is_running)
 		return; 
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
 	if (open_summary_file (summary_file_path, &summary)) {
 		SummaryFileHeader *header;

Modified: branches/indexer-split/src/trackerd/tracker-email-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-utils.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-utils.c	Tue Apr 29 08:40:10 2008
@@ -38,7 +38,7 @@
 #include "tracker-cache.h"
 #include "tracker-db-email.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-email-utils.h"
 #include "tracker-watch.h"
 
@@ -134,7 +134,7 @@
 	tracker->mbox_count++;
 
         /* Signal progress */
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
         g_signal_emit_by_name (object,
                                "index-progress", 
                                "Emails",                
@@ -198,7 +198,7 @@
 			}
 			
                         /* Signal progress */
-                        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+                        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
                         g_signal_emit_by_name (object, 
                                                "index-progress", 
                                                "Emails",                
@@ -215,7 +215,7 @@
 	tracker->mbox_processed++;
         
         /* Signal progress */
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
         g_signal_emit_by_name (object,
                                "index-progress", 
                                "Emails",                

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	Tue Apr 29 08:40:10 2008
@@ -54,7 +54,7 @@
 #include "tracker-indexer.h"
 #include "tracker-cache.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-hal.h"
 #include "tracker-process-files.h"
 #include "tracker-query-tree.h"
@@ -406,7 +406,7 @@
 	tracker->merge_processed = 0;
 	
         /* Signal progress */
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
         g_signal_emit_by_name (object, 
                                "index-progress", 
                                "Merging",
@@ -466,7 +466,7 @@
 	tracker->merge_processed = 1;
 
         /* Signal progress */
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
         g_signal_emit_by_name (object, 
 			       "index-progress", 
                                "Merging",                     
@@ -586,7 +586,7 @@
                 return;
         }
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
 	if (type == INDEX_TYPE_FILES) {
 
@@ -826,7 +826,7 @@
 				tracker->merge_processed++;
 
                                 /* Signal progress */
-                                object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+                                object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
                                 g_signal_emit_by_name (object, 
                                                        "index-progress", 
                                                        "Merging",

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	Tue Apr 29 08:40:10 2008
@@ -40,7 +40,7 @@
 #include "tracker-apps.h"
 #include "tracker-db.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 #include "tracker-cache.h"
 #include "tracker-email.h"
 #include "tracker-hal.h"
@@ -768,7 +768,7 @@
         tracker_log ("Starting file indexing...");
         
         db_con = tracker->index_db;
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
         tracker_db_end_index_transaction (db_con);
 
@@ -1037,7 +1037,7 @@
         tracker->index_status = INDEX_EMAILS;
         
         /* Signal progress */
-        daemon = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        daemon = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
         g_signal_emit_by_name (daemon, "index-progress", 
                                "Emails",
                                "",
@@ -1080,7 +1080,7 @@
         GObject      *object;
 
         db_con = tracker->index_db;
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
         /* Check dir_queue in case there are
          * directories waiting to be indexed.
@@ -1492,7 +1492,7 @@
 
         process_block_signals (); 
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
         tracker = (Tracker*) data;
 
@@ -1563,7 +1563,7 @@
 
 	tracker->index_status = INDEX_CONFIG;
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
 	pushed_events = FALSE;
 	first_run = TRUE;
@@ -1696,7 +1696,7 @@
 				}
 
                                 /* Signal progress */
-                                object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+                                object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
                                 g_signal_emit_by_name (object, 
                                                        "index-progress", 
                                                        "Files",

Modified: branches/indexer-split/src/trackerd/tracker-status.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-status.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-status.c	Tue Apr 29 08:40:10 2008
@@ -21,7 +21,7 @@
 
 #include "tracker-status.h"
 #include "tracker-dbus.h"
-#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-daemon.h"
 
 static TrackerStatus status = TRACKER_STATUS_INITIALIZING;
 
@@ -130,7 +130,7 @@
                 return;
         }
 
-        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
+        object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
 
         g_signal_emit_by_name (object, 
                                "index-state-change", 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	Tue Apr 29 08:40:10 2008
@@ -20,7 +20,7 @@
  */
 
 #include "tracker-xesam-live-search.h"
-#include "tracker-dbus-xesam-search.h"
+#include "tracker-xesam-search.h"
 #include "tracker-dbus.h"
 #include "tracker-xesam.h"
 
@@ -70,7 +70,7 @@
 void 
 tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self, guint count) 
 {
-	TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_ADDED], 0, 
 		tracker_xesam_live_search_get_id (self), count);
@@ -91,7 +91,7 @@
 void 
 tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self, GArray *hit_ids) 
 {
-	TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_REMOVED], 0, 
 		tracker_xesam_live_search_get_id (self), hit_ids); 
@@ -112,7 +112,7 @@
 void 
 tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self, GArray *hit_ids) 
 {
-	TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_MODIFIED], 0, 
 		tracker_xesam_live_search_get_id (self), hit_ids); 
@@ -133,7 +133,7 @@
 void 
 tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self) 
 {
-	TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_SEARCH_DONE], 0, 
 		tracker_xesam_live_search_get_id (self)); 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.h	Tue Apr 29 08:40:10 2008
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "tracker-xesam-live-search.h"
-#include "tracker-dbus-xesam-search.h"
+#include "tracker-xesam-search.h"
 
 G_BEGIN_DECLS
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c	Tue Apr 29 08:40:10 2008
@@ -32,7 +32,7 @@
 }
 
 TrackerXesamSession *
-tracker_xesam_create_session (TrackerDBusXesamSearch *dbus_proxy, gchar **session_id, GError **error)
+tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy, gchar **session_id, GError **error)
 {
 	TrackerXesamSession *session;
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.h	Tue Apr 29 08:40:10 2008
@@ -29,7 +29,7 @@
 TrackerXesamSession* tracker_xesam_get_session (const gchar *session_id, GError **error);
 TrackerXesamSession* tracker_xesam_get_session_for_search (const gchar *search_id, TrackerXesamLiveSearch **search_in, GError **error);
 TrackerXesamLiveSearch* tracker_xesam_get_live_search (const gchar *search_id, GError **error);
-TrackerXesamSession* tracker_xesam_create_session (TrackerDBusXesamSearch *dbus_proxy, gchar **session_id, GError **error);
+TrackerXesamSession* tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy, gchar **session_id, GError **error);
 void tracker_xesam_close_session (const gchar *session_id, GError **error);
 
 typedef enum {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]