[folks] Rename Favouritable -> FavouriteDetails



commit b181a6587e3be54f0a6cef9109534c9801659c02
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Mar 10 14:53:06 2011 -0800

    Rename Favouritable -> FavouriteDetails
    
    Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named

 NEWS                                               |    1 +
 backends/telepathy/lib/tpf-persona.vala            |    4 ++--
 folks/Makefile.am                                  |    2 +-
 .../{favouritable.vala => favourite-details.vala}  |    2 +-
 folks/individual.vala                              |   10 +++++-----
 5 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/NEWS b/NEWS
index fe65fd9..e911499 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ API changes:
 * Rename Aliasable -> AliasDetails
 * Rename AvatarOwner -> AvatarDetails
 * Rename Emailable -> EmailDetails
+* Rename Favouritable -> FavouriteDetails
 
 Overview of changes from libfolks 0.3.5 to libfolks 0.3.6
 =========================================================
diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index 7bdb4b4..5b38ecc 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -30,7 +30,7 @@ using Folks;
 public class Tpf.Persona : Folks.Persona,
     AliasDetails,
     AvatarDetails,
-    Favouritable,
+    FavouriteDetails,
     Groupable,
     PresenceOwner,
     IMable
@@ -113,7 +113,7 @@ public class Tpf.Persona : Folks.Persona,
   /**
    * Whether this Persona is a user-defined favourite.
    *
-   * See { link Folks.Favouritable.is_favourite}.
+   * See { link Folks.FavouriteDetails.is_favourite}.
    */
   public bool is_favourite
     {
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 6bf2c83..ae943d2 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -18,7 +18,7 @@ libfolks_la_SOURCES = \
 	backend-store.vala \
 	birthday-details.vala \
 	email-details.vala \
-	favouritable.vala \
+	favourite-details.vala \
 	field-details.vala \
 	gender-owner.vala \
 	groupable.vala \
diff --git a/folks/favouritable.vala b/folks/favourite-details.vala
similarity index 95%
rename from folks/favouritable.vala
rename to folks/favourite-details.vala
index 869b1a8..c1f0fa2 100644
--- a/folks/favouritable.vala
+++ b/folks/favourite-details.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.Favouritable : Object
+public interface Folks.FavouriteDetails : Object
 {
   /**
    * Whether this contact is a user-defined favourite.
diff --git a/folks/individual.vala b/folks/individual.vala
index d71f24a..6d75aec 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -67,7 +67,7 @@ public class Folks.Individual : Object,
     AvatarDetails,
     BirthdayDetails,
     EmailDetails,
-    Favouritable,
+    FavouriteDetails,
     GenderOwner,
     Groupable,
     IMable,
@@ -370,11 +370,11 @@ public class Folks.Individual : Object,
           this._is_favourite = value;
           this._persona_list.foreach ((p) =>
             {
-              if (p is Favouritable)
+              if (p is FavouriteDetails)
                 {
                   SignalHandler.block_by_func (p,
                       (void*) this._notify_is_favourite_cb, this);
-                  ((Favouritable) p).is_favourite = value;
+                  ((FavouriteDetails) p).is_favourite = value;
                   SignalHandler.unblock_by_func (p,
                       (void*) this._notify_is_favourite_cb, this);
                 }
@@ -750,9 +750,9 @@ public class Folks.Individual : Object,
 
       this._persona_list.foreach ((p) =>
         {
-          if (favourite == false && p is Favouritable)
+          if (favourite == false && p is FavouriteDetails)
             {
-              favourite = ((Favouritable) p).is_favourite;
+              favourite = ((FavouriteDetails) p).is_favourite;
               if (favourite == true)
                 return;
             }



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