[folks/edsport] Use SourceRegistry.sync() instead of custom function. Remove no longer needed create_source_registry



commit d921aee0bc840446e1f40ebc98826b64d1fc142d
Author: Jeremy Whiting <jpwhiting kde org>
Date:   Mon Jun 11 11:21:50 2012 -0600

    Use SourceRegistry.sync() instead of custom function.
    Remove no longer needed create_source_registry.

 backends/eds/eds-backend.vala            |    2 +-
 backends/eds/lib/edsf-persona-store.vala |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index bc1d4b1..5d000a7 100644
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -112,7 +112,7 @@ public class Folks.Backends.Eds.Backend : Folks.Backend
 
               this._create_avatars_cache_dir ();
 
-              this._ab_sources = yield create_source_registry ();
+              this._ab_sources = new SourceRegistry.sync (null);
               /* Our callback only looks for added sources, so we only
                need to connect to source-added and source-enabled signals */
               this._ab_sources.source_added.connect (
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 1a2eb30..47dd5e6 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -28,9 +28,6 @@ using GLib;
 
 extern const string BACKEND_NAME;
 
-[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h", finish_function = "e_source_registry_new_finish")]
-public extern static async E.SourceRegistry create_source_registry (GLib.Cancellable? cancellable = null) throws GLib.Error;
-
 /**
  * A persona store.
  * It will create { link Persona}s for each contacts on the main addressbook.
@@ -625,7 +622,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
               /* Listen for removal signals for the address book. There's no
                * need to check if we still exist in the list, as
                * addressbook.open() will fail if we don't. */
-              this._source_registry = yield create_source_registry ();
+              this._source_registry = new SourceRegistry.sync (null);
 
               /* We know _source_registry != null because otherwise
                * E.BookClient.get_sources() would've thrown an error. */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]