[folks] Fix some error domains



commit 6fe31a311871f096f605ed93bc60fb09db835235
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Mon Sep 13 13:49:41 2010 +0100

    Fix some error domains
    
    Add error domains to override methods, remove error domains from
    constructors and make some error domains more specific. This shouldn't break
    API. Helps: bgo#627158

 backends/key-file/kf-backend.vala             |    4 ++--
 backends/telepathy/lib/tpf-persona-store.vala |    4 ++--
 folks/individual-aggregator.vala              |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/backends/key-file/kf-backend.vala b/backends/key-file/kf-backend.vala
index 1e0e1a0..3da0d23 100644
--- a/backends/key-file/kf-backend.vala
+++ b/backends/key-file/kf-backend.vala
@@ -47,7 +47,7 @@ public class Folks.Backends.Kf.Backend : Folks.Backend
   /**
    * { inheritDoc}
    */
-  public Backend () throws GLib.Error
+  public Backend ()
     {
       Object (name: "key-file");
     }
@@ -55,7 +55,7 @@ public class Folks.Backends.Kf.Backend : Folks.Backend
   /**
    * { inheritDoc}
    */
-  public override async void prepare ()
+  public override async void prepare () throws GLib.Error
     {
       File file;
       string path = Environment.get_variable ("FOLKS_BACKEND_KEY_FILE_PATH");
diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index 41ac34d..1721bdb 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -914,7 +914,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
     }
 
   private async GLib.List<Tpf.Persona>? create_personas_from_contact_ids (
-      string[] contact_ids) throws GLib.Error
+      string[] contact_ids) throws Folks.PersonaStoreError
     {
       ContactFeature[] features =
         {
@@ -1131,7 +1131,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
                   personas.length ());
             }
         }
-      catch (GLib.Error e)
+      catch (Folks.PersonaStoreError e)
         {
           warning ("failed to add a persona from details: %s", e.message);
         }
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 0f899f9..9bb942b 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -662,7 +662,7 @@ public class Folks.IndividualAggregator : Object
 
   /* FIXME: This should be GLib.List<Persona>, but Vala won't allow it */
   public async void link_personas (void *_personas)
-      throws GLib.Error
+      throws IndividualAggregatorError
     {
       unowned GLib.List<Persona> personas = (GLib.List<Persona>) _personas;
 



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