[tracker/tracker-store-queue: 15/15] Merge branch 'tracker-store' into tracker-store-queue

[Philip Van Hoof <pvanhoof src gnome org>]

commit 52057dca93e2f7116bb8ac8484c71d0f5a83bbe3
Merge: a954013... 4f56a11...
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon May 25 15:19:05 2009 +0200

    Merge branch 'tracker-store' into tracker-store-queue
    
    Conflicts:
    	data/dbus/tracker-indexer.xml

 data/dbus/tracker-indexer.xml                      |   22 ---
 data/ontologies/32-nco.ontology                    |    1 -
 src/libtracker-common/Makefile.am                  |    2 +
 .../tracker-status.c                               |  173 ++---------------
 .../tracker-status.h                               |    0
 src/libtracker-data/tracker-data-update.c          |   18 ++-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   23 +--
 src/tracker-extract/tracker-extract-albumart.c     |   50 +++---
 src/tracker-extract/tracker-extract-albumart.h     |    1 +
 .../tracker-extract-gstreamer-helix.c              |    4 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   53 +++++-
 src/tracker-extract/tracker-extract-mp3.c          |   18 +-
 src/tracker-extract/tracker-extract.c              |    3 +-
 src/tracker-indexer/Makefile.am                    |   11 +
 src/tracker-indexer/modules/evolution-common.h     |   15 +-
 src/tracker-indexer/modules/evolution.c            |   36 ++++-
 .../tracker-crawler.c                              |    3 +-
 .../tracker-crawler.h                              |    0
 src/tracker-indexer/tracker-indexer.c              |  137 ++++++--------
 src/tracker-indexer/tracker-indexer.h              |   20 +--
 src/tracker-indexer/tracker-marshal.list           |    4 +
 .../tracker-monitor.c                              |    2 +-
 .../tracker-monitor.h                              |    0
 .../tracker-processor.c                            |  199 +++++---------------
 .../tracker-processor.h                            |    5 +-
 src/tracker-store/Makefile.am                      |   14 --
 src/tracker-store/tracker-daemon.c                 |   33 +---
 src/tracker-store/tracker-daemon.h                 |    5 +-
 src/tracker-store/tracker-dbus.c                   |    7 +-
 src/tracker-store/tracker-dbus.h                   |    5 +-
 src/tracker-store/tracker-main.c                   |  131 +------------
 src/tracker-store/tracker-marshal.list             |    4 -
 src/tracker-store/tracker-resources.c              |    1 +
 tests/tracker-indexer/Makefile.am                  |    8 +
 34 files changed, 329 insertions(+), 679 deletions(-)

diff --cc data/dbus/tracker-indexer.xml
index 2e85b8c,93df228..e9335b8
--- a/data/dbus/tracker-indexer.xml
+++ b/data/dbus/tracker-indexer.xml
@@@ -11,28 -11,11 +11,6 @@@
  
  <node name="/">
    <interface name="org.freedesktop.Tracker.Indexer">  
-     <method name="FilesCheck">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-       <arg type="s" name="module" direction="in" />
-       <arg type="as" name="files" direction="in" />
-     </method>
-     <method name="FilesUpdate">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-       <arg type="s" name="module" direction="in" />
-       <arg type="as" name="files" direction="in" />
-     </method>
-     <method name="FilesDelete">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-       <arg type="s" name="module" direction="in" />
-       <arg type="as" name="files" direction="in" />
-     </method>
-     <method name="FileMove">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-       <arg type="s" name="module" direction="in" />
-       <arg type="s" name="file_from" direction="in" />
-       <arg type="s" name="file_to" direction="in" />
-     </method>
- 
 -    <method name="TurtleAdd">
 -      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
 -      <arg type="s" name="file" direction="in" />
 -    </method>
 -
      <method name="VolumeDisableAll">
        <annotation name="org.freedesktop.DBus.GLib.Async"
        value="true"/>
diff --cc src/tracker-indexer/tracker-indexer.h
index b000369,ccc9756..c72e933
--- a/src/tracker-indexer/tracker-indexer.h
+++ b/src/tracker-indexer/tracker-indexer.h
@@@ -103,28 -103,17 +103,14 @@@ void            tracker_indexer_pause_f
  void            tracker_indexer_continue            (TrackerIndexer         *indexer,
  						     DBusGMethodInvocation  *context,
  						     GError                **error);
 -void		tracker_indexer_turtle_add	   (TrackerIndexer *indexer,
 -						    const gchar             *file,
 -						    DBusGMethodInvocation *context,
 -						    GError **error);
 +
  void            tracker_indexer_files_check         (TrackerIndexer         *indexer,
  						     const gchar            *module,
- 						     GStrv                   files,
- 						     DBusGMethodInvocation  *context,
- 						     GError                **error);
- void            tracker_indexer_files_update        (TrackerIndexer         *indexer,
- 						     const gchar            *module,
- 						     GStrv                   files,
- 						     DBusGMethodInvocation  *context,
- 						     GError                **error);
- void            tracker_indexer_files_delete        (TrackerIndexer         *indexer,
- 						     const gchar            *module,
- 						     GStrv                   files,
- 						     DBusGMethodInvocation  *context,
- 						     GError                **error);
+ 						     GStrv                   files);
  void            tracker_indexer_file_move           (TrackerIndexer         *indexer,
  						     const gchar            *module_name,
- 						     gchar                  *from,
- 						     gchar                  *to,
- 						     DBusGMethodInvocation  *context,
- 						     GError                **error);
+ 						     const gchar            *from,
+ 						     const gchar            *to);
  void            tracker_indexer_volume_disable_all  (TrackerIndexer         *indexer,
  						     DBusGMethodInvocation  *context,
  						     GError                **error);