[folks] Rename the Avatar interface to HasAvatar

[Philip Withnall <pwithnall src gnome org>]

commit 4c35a03bf5a6efe5ee3a865ba4d79857d57fc9c2
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Sun Dec 12 18:24:08 2010 +0000

    Rename the Avatar interface to HasAvatar
    
    Helps: bgo#627397

 NEWS                                    |    3 +++
 backends/telepathy/lib/tpf-persona.vala |    4 ++--
 folks/Makefile.am                       |    2 +-
 folks/{avatar.vala => has-avatar.vala}  |    2 +-
 folks/individual.vala                   |    6 +++---
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index 94934c2..fa448ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 Overview of changes from libfolks 0.3.2 to libfolks 0.3.3
 =========================================================
 
+API changes:
+* Rename the Avatar interface to HasAvatar
+
 Bugs fixed:
 * Bug 635178 â?? Leak in
   folks_tp_lowlevel_connection_open_contact_list_channel_async
diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index 0a899a2..9f5eff0 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -29,9 +29,9 @@ using Folks;
  */
 public class Tpf.Persona : Folks.Persona,
     Aliasable,
-    Avatar,
     Favourite,
     Groupable,
+    HasAvatar,
     IMable,
     Presence
 {
@@ -50,7 +50,7 @@ public class Tpf.Persona : Folks.Persona,
   /**
    * An avatar for the Persona.
    *
-   * See { link Folks.Avatar.avatar}.
+   * See { link Folks.HasAvatar.avatar}.
    */
   public File avatar { get; set; }
 
diff --git a/folks/Makefile.am b/folks/Makefile.am
index a83dbfa..464a575 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -13,11 +13,11 @@ lib_LTLIBRARIES = libfolks.la
 # Vala files to compile into libfolks.la
 libfolks_la_SOURCES = \
 	aliasable.vala \
-	avatar.vala \
 	backend.vala \
 	backend-store.vala \
 	favourite.vala \
 	groupable.vala \
+	has-avatar.vala \
 	imable.vala \
 	individual.vala \
 	individual-aggregator.vala \
diff --git a/folks/avatar.vala b/folks/has-avatar.vala
similarity index 96%
rename from folks/avatar.vala
rename to folks/has-avatar.vala
index a8c7bef..bda939e 100644
--- a/folks/avatar.vala
+++ b/folks/has-avatar.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.Avatar : Object
+public interface Folks.HasAvatar : Object
 {
   /**
    * An avatar for the contact.
diff --git a/folks/individual.vala b/folks/individual.vala
index 7d9dbad..0f68cc3 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -64,9 +64,9 @@ public enum Folks.TrustLevel
  */
 public class Folks.Individual : Object,
     Aliasable,
-    Avatar,
     Favourite,
     Groupable,
+    HasAvatar,
     IMable,
     Presence
 {
@@ -654,9 +654,9 @@ public class Folks.Individual : Object,
 
       this._persona_list.foreach ((p) =>
         {
-          if (avatar == null && p is Avatar)
+          if (avatar == null && p is HasAvatar)
             {
-              avatar = ((Avatar) p).avatar;
+              avatar = ((HasAvatar) p).avatar;
               return;
             }
         });