[f-spot/taglib-metadata: 7/10] Remove the DBus service.

[Ruben Vermeersch <rubenv src gnome org>]

commit d946605735d258e0a50f05a0d8ee591c4a98e596
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Jun 12 13:46:50 2010 +0200

    Remove the DBus service.
    
    DBus support should really be in the core. Also, the way it is currently
    implemented is pretty broken. We'll re-add it cleanly.

 build/build.environment.mk                         |    1 -
 extensions/Makefile.am                             |    1 -
 extensions/Services/.gitignore                     |    2 -
 extensions/Services/DBusService/.gitignore         |    5 -
 extensions/Services/DBusService/DBusProxy.cs       |  414 --------------------
 .../Services/DBusService/DBusService.addin.xml     |   16 -
 extensions/Services/DBusService/DBusService.cs     |   41 --
 extensions/Services/DBusService/Makefile.am        |   12 -
 extensions/Services/Makefile.am                    |    2 -
 src/PhotoQuery.cs                                  |    4 -
 src/PhotoStore.cs                                  |   35 --
 11 files changed, 0 insertions(+), 533 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 710ea32..dc0891f 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -165,7 +165,6 @@ LINK_MONO_TABBLO_DEPS = $(REF_MONO_TABBLO) $(LINK_MONO_TABBLO)
 REF_FSPOT_EXTENSION_TABBLOEXPORT = $(LINK_FSPOT_DEPS) $(LINK_KEYRING) $(LINK_MONO_TABBLO_DEPS)
 
 REF_FSPOT_EXTENSION_ZIPEXPORT = $(LINK_FSPOT_DEPS)
-REF_FSPOT_EXTENSION_DBUSSERVICE = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_CHANGEPHOTOPATH = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_DEVELOPINUFRAW = $(LINK_FSPOT_DEPS)
 REF_FSPOT_EXTENSION_HASHJOB = $(LINK_FSPOT_DEPS)
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 6b51acf..628616f 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = 			\
 	Editors		\
 	Exporters		\
-	Services		\
 	Tools			\
 	Transitions
 
diff --git a/src/PhotoQuery.cs b/src/PhotoQuery.cs
index 68c111c..7aceaa3 100644
--- a/src/PhotoQuery.cs
+++ b/src/PhotoQuery.cs
@@ -76,10 +76,6 @@ namespace FSpot {
 		public PhotoQuery (PhotoStore store, params IQueryCondition [] conditions)
 		{
 			this.store = store;
-			// Note: this is to let the query pick up
-			// 	 photos that were added or removed over dbus
-			this.store.ItemsAddedOverDBus += delegate { RequestReload(); };
-			this.store.ItemsRemovedOverDBus += delegate { RequestReload(); };
 			this.store.ItemsChanged += MarkChanged;
 			cache = new PhotoCache (store, temp_table);
 			reverse_lookup = new Dictionary<uint, int> ();
diff --git a/src/PhotoStore.cs b/src/PhotoStore.cs
index 7d248fc..98ad319 100644
--- a/src/PhotoStore.cs
+++ b/src/PhotoStore.cs
@@ -519,41 +519,6 @@ public class PhotoStore : DbStore<Photo> {
 
 		Commit (photo);
 	}
-	
-	// Dbus
-	public event EventHandler<DbItemEventArgs<Photo>> ItemsAddedOverDBus;
-	public event EventHandler<DbItemEventArgs<Photo>> ItemsRemovedOverDBus;
-
-	public Photo CreateOverDBus (string new_path, string orig_path, uint roll_id)  {
-		Photo photo = Create (new SafeUri (new_path), new SafeUri (orig_path), roll_id, Photo.GenerateMD5 (new SafeUri (new_path)));
-		EmitAddedOverDBus (photo);
-
-		return photo;
-	}
-
-	public void RemoveOverDBus (Photo photo) {
-	 	Remove (photo);
-		EmitRemovedOverDBus (photo);
-	}
-
-
-	protected void EmitAddedOverDBus (Photo photo) {
-	 	EmitAddedOverDBus (new Photo [] { photo });
-	}
-
-	protected void EmitAddedOverDBus (Photo [] photos) {
-	 	if (ItemsAddedOverDBus != null)
-		 	ItemsAddedOverDBus (this, new DbItemEventArgs<Photo> (photos));
-	}
-
-	protected void EmitRemovedOverDBus (Photo photo) {
-		EmitRemovedOverDBus (new Photo [] { photo });
-	}
-
-	protected void EmitRemovedOverDBus (Photo [] photos) {
-		if (ItemsRemovedOverDBus != null)
-		 	ItemsRemovedOverDBus (this, new DbItemEventArgs<Photo> (photos)); 
-	}
 
 	public int Count (string table_name, params IQueryCondition [] conditions)
 	{