[folks/wip/arbitrary-field-interface] Make return value from get_extended_field nullable



commit c9022a9eba71ffe945bfb8e905c872d1fbe19fa8
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Jul 10 16:47:15 2013 +0200

    Make return value from get_extended_field nullable

 backends/eds/lib/edsf-persona-store.vala |    2 +-
 backends/eds/lib/edsf-persona.vala       |    6 +++---
 folks/extended-info.vala                 |   12 ++++++------
 folks/individual.vala                    |    6 +++---
 folks/persona-store.vala                 |    2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index a1b3ddd..ca627e6 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -1690,7 +1690,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
       yield this._commit_modified_property (persona, "email-addresses");
     }
 
-  internal ExtendedFieldDetails _get_extended_field (Edsf.Persona persona, string name)
+  internal ExtendedFieldDetails? _get_extended_field (Edsf.Persona persona, string name)
     {
       unowned VCardAttribute? attr = persona.contact.get_attribute (name);
       if (attr != null)
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 8f98dff..9e9af86 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -350,9 +350,9 @@ public class Edsf.Persona : Folks.Persona,
   /**
    * { inheritDoc}
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
-  public ExtendedFieldDetails get_extended_field (string name)
+  public ExtendedFieldDetails? get_extended_field (string name)
     {
       return ((Edsf.PersonaStore) this.store)._get_extended_field (this, name);
     }
@@ -360,7 +360,7 @@ public class Edsf.Persona : Folks.Persona,
   /**
    * { inheritDoc}
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
   public async void change_extended_field (
       string name, ExtendedFieldDetails value) throws PropertyError
diff --git a/folks/extended-info.vala b/folks/extended-info.vala
index 14b9585..199812d 100644
--- a/folks/extended-info.vala
+++ b/folks/extended-info.vala
@@ -28,7 +28,7 @@ using Gee;
  * See { link Folks.AbstractFieldDetails} for details on common parameter names
  * and values.
  *
- * @since 0.9.4
+ * @since UNRELEASED 
  */
 public class Folks.ExtendedFieldDetails : AbstractFieldDetails<string>
 {
@@ -42,7 +42,7 @@ public class Folks.ExtendedFieldDetails : AbstractFieldDetails<string>
    *
    * @return a new ExtendedFieldDetails
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
   public ExtendedFieldDetails (string value,
                                MultiMap<string, string>? parameters = null)
@@ -84,16 +84,16 @@ public class Folks.ExtendedFieldDetails : AbstractFieldDetails<string>
  * This interface allows clients to store arbitrary fields for contacts in backends
  * that support it.
  *
- * @since 0.9.4
+ * @since UNRELEASED
  */
 public interface Folks.ExtendedInfo : Object
 {
   /**
    * Retrieve the value for an arbitrary field.
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
-  public abstract ExtendedFieldDetails get_extended_field (string name);
+  public abstract ExtendedFieldDetails? get_extended_field (string name);
 
   /**
    * Change the value of an arbitrary field.
@@ -102,7 +102,7 @@ public interface Folks.ExtendedInfo : Object
    * @param value new value for the arbitrary field
    * @throws PropertyError if setting the value failed
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
   public virtual async void change_extended_field (
       string name, ExtendedFieldDetails value) throws PropertyError
diff --git a/folks/individual.vala b/folks/individual.vala
index fd1315a..3577b7c 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -961,9 +961,9 @@ public class Folks.Individual : Object,
   /**
    * { inheritDoc}
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
-  public ExtendedFieldDetails get_extended_field (string name)
+  public ExtendedFieldDetails? get_extended_field (string name)
     {
       debug ("Getting extended field '%s' on '%s'…", name, this.id);
 
@@ -984,7 +984,7 @@ public class Folks.Individual : Object,
   /**
    * { inheritDoc}
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
   public async void change_extended_field (
       string name, ExtendedFieldDetails value) throws PropertyError
diff --git a/folks/persona-store.vala b/folks/persona-store.vala
index a360dba..c336328 100644
--- a/folks/persona-store.vala
+++ b/folks/persona-store.vala
@@ -313,7 +313,7 @@ public enum Folks.PersonaDetail
   /**
    * Field for { link ExtendedFieldDetails}.
    *
-   * @since 0.9.4
+   * @since UNRELEASED
    */
   EXTENDED_INFO,
 }


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