Rename HasAvatar -> AvatarOwner.

Helps bgo#627397.

diff --git a/NEWS b/NEWS
index f1101fe..fff8d54 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ Bugs fixed:
 * Bug 639742 — Logger service unavailable in make check
 * Bug 640213 — Add tests for LinkedHashSet
 
+API changes:
+* Rename the HasAvatar interface to AvatarOwner
+
 Overview of changes from libfolks 0.3.2 to libfolks 0.3.3
 =========================================================
 

diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index f168d6c..5f04159 100644 (file)
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -31,7 +31,7 @@ public class Tpf.Persona : Folks.Persona,
     Aliasable,
     Favouritable,
     Groupable,
-    HasAvatar,
+    AvatarOwner,
     HasPresence,
     IMable
 {
@@ -50,7 +50,7 @@ public class Tpf.Persona : Folks.Persona,
   /**
    * An avatar for the Persona.
    *
-   * See {@link Folks.HasAvatar.avatar}.
+   * See {@link Folks.AvatarOwner.avatar}.
    */
   public File avatar { get; set; }
 

diff --git a/folks/Makefile.am b/folks/Makefile.am
index afe0fda..f29a4bd 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -17,7 +17,7 @@ libfolks_la_SOURCES = \
        backend-store.vala \
        favouritable.vala \
        groupable.vala \
-       has-avatar.vala \
+       avatar-owner.vala \
        has-presence.vala \
        imable.vala \
        individual.vala \

diff --git a/folks/has-avatar.vala b/folks/avatar-owner.vala
similarity index 96%
rename from folks/has-avatar.vala
rename to folks/avatar-owner.vala
index bda939e..f50868b 100644 (file)
--- a/folks/has-avatar.vala
+++ b/folks/avatar-owner.vala
@@ -24,7 +24,7 @@ using GLib;
  * Interface for classes which represent contacts which have an avatar
  * (pictorial representation), such as {@link Persona} and {@link Individual}.
  */
-public interface Folks.HasAvatar : Object
+public interface Folks.AvatarOwner : Object
 {
   /**
    * An avatar for the contact.

diff --git a/folks/individual.vala b/folks/individual.vala
index 64717b1..01165d0 100644 (file)
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -66,7 +66,7 @@ public class Folks.Individual : Object,
     Aliasable,
     Favouritable,
     Groupable,
-    HasAvatar,
+    AvatarOwner,
     HasPresence,
     IMable
 {
@@ -655,9 +655,9 @@ public class Folks.Individual : Object,
 
       this._persona_list.foreach ((p) =>
         {
-          if (avatar == null && p is HasAvatar)
+          if (avatar == null && p is AvatarOwner)
             {
-              avatar = ((HasAvatar) p).avatar;
+              avatar = ((AvatarOwner) p).avatar;
               return;
             }
         });