[folks] Rename the Favourite interface to Favouritable

[Philip Withnall <pwithnall src gnome org>]

commit 272e05c498430c2584753ce452e6ffd7fdbffbbe
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Sun Dec 12 18:32:51 2010 +0000

    Rename the Favourite interface to Favouritable
    
    Closes: bgo#627397

 NEWS                                        |    2 ++
 backends/telepathy/lib/tpf-persona.vala     |    4 ++--
 folks/Makefile.am                           |    2 +-
 folks/{favourite.vala => favouritable.vala} |    2 +-
 folks/individual.vala                       |   10 +++++-----
 5 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/NEWS b/NEWS
index 2c8ca9a..f5c8d30 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Overview of changes from libfolks 0.3.2 to libfolks 0.3.3
 API changes:
 * Rename the Avatar interface to HasAvatar
 * Rename the Presence interface to HasPresence
+* Rename the Favourite interface to Favouritable
 
 Bugs fixed:
 * Bug 635178 â?? Leak in
@@ -13,6 +14,7 @@ Bugs fixed:
 * Bug 635823 â?? [PATCH] telepathy test not linking against GIO
 * Bug 636251 â?? Fails to add contact
 * Bug 629526 â?? Generate gtk-doc documentation
+* Bug 627397 â?? Use better interface names
 
 Overview of changes from libfolks 0.3.1 to libfolks 0.3.2
 ==========================================================
diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index 8734f63..fe7aaee 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -29,7 +29,7 @@ using Folks;
  */
 public class Tpf.Persona : Folks.Persona,
     Aliasable,
-    Favourite,
+    Favouritable,
     Groupable,
     HasAvatar,
     HasPresence,
@@ -101,7 +101,7 @@ public class Tpf.Persona : Folks.Persona,
   /**
    * Whether this Persona is a user-defined favourite.
    *
-   * See { link Folks.Favourite.is_favourite}.
+   * See { link Folks.Favouritable.is_favourite}.
    */
   public bool is_favourite
     {
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 5ec47ab..f5be30d 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -15,7 +15,7 @@ libfolks_la_SOURCES = \
 	aliasable.vala \
 	backend.vala \
 	backend-store.vala \
-	favourite.vala \
+	favouritable.vala \
 	groupable.vala \
 	has-avatar.vala \
 	has-presence.vala \
diff --git a/folks/favourite.vala b/folks/favouritable.vala
similarity index 95%
rename from folks/favourite.vala
rename to folks/favouritable.vala
index cc47b01..869b1a8 100644
--- a/folks/favourite.vala
+++ b/folks/favouritable.vala
@@ -24,7 +24,7 @@ using GLib;
  * Interface exposing a { link Persona}'s or { link Individual}'s user-defined
  * status as a favourite.
  */
-public interface Folks.Favourite : Object
+public interface Folks.Favouritable : Object
 {
   /**
    * Whether this contact is a user-defined favourite.
diff --git a/folks/individual.vala b/folks/individual.vala
index f64459a..bf3d180 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -64,7 +64,7 @@ public enum Folks.TrustLevel
  */
 public class Folks.Individual : Object,
     Aliasable,
-    Favourite,
+    Favouritable,
     Groupable,
     HasAvatar,
     HasPresence,
@@ -234,11 +234,11 @@ public class Folks.Individual : Object,
           this._is_favourite = value;
           this._persona_list.foreach ((p) =>
             {
-              if (p is Favourite)
+              if (p is Favouritable)
                 {
                   SignalHandler.block_by_func (p,
                       (void*) this.notify_is_favourite_cb, this);
-                  ((Favourite) p).is_favourite = value;
+                  ((Favouritable) p).is_favourite = value;
                   SignalHandler.unblock_by_func (p,
                       (void*) this.notify_is_favourite_cb, this);
                 }
@@ -547,9 +547,9 @@ public class Folks.Individual : Object,
 
       this._persona_list.foreach ((p) =>
         {
-          if (favourite == false && p is Favourite)
+          if (favourite == false && p is Favouritable)
             {
-              favourite = ((Favourite) p).is_favourite;
+              favourite = ((Favouritable) p).is_favourite;
               if (favourite == true)
                 return;
             }