[folks] Rename RoleOwner -> RoleDetails



commit 82685d87b6def34fd92401d8e9e824f0f4e366e0
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Mar 10 17:04:55 2011 -0800

    Rename RoleOwner -> RoleDetails
    
    Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named

 NEWS                                         |    4 ++--
 folks/Makefile.am                            |    2 +-
 folks/individual.vala                        |    8 ++++----
 folks/{role-owner.vala => role-details.vala} |    2 +-
 po/POTFILES.in                               |    2 +-
 po/POTFILES.skip                             |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/NEWS b/NEWS
index 12d37dc..0f1ef39 100644
--- a/NEWS
+++ b/NEWS
@@ -19,14 +19,14 @@ Bugs fixed:
 * Bug 643955 â?? Add to_string () to RoleOwner class
 
 API changes:
-* Add RoleOwner interface
+* Add RoleDetails interface
 * Add BirthdayDetails interface
 * Add NoteDetails interface
 * Add PostalAddressDetails interface
 * Add PostalAddressDetails.uid as a convenience for backends
 * Add PostalAddress.equal()
 * Add PostalAddress.to_string()
-* Add RoleOwner.to_string()
+* Add RoleDetails.to_string()
 * Rename Aliasable -> AliasDetails
 * Rename AvatarOwner -> AvatarDetails
 * Rename Emailable -> EmailDetails
diff --git a/folks/Makefile.am b/folks/Makefile.am
index ddd78e3..0c70454 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -28,6 +28,7 @@ libfolks_la_SOURCES = \
 	phone-details.vala \
 	postal-address-details.vala \
 	presence-details.vala \
+	role-details.vala \
 	individual.vala \
 	individual-aggregator.vala \
 	linked-hash-set.vala \
@@ -36,7 +37,6 @@ libfolks_la_SOURCES = \
 	types.vala \
 	urlable.vala \
 	debug.vala \
-	role-owner.vala \
 	$(NULL)
 
 libfolks_la_VALAFLAGS = \
diff --git a/folks/individual.vala b/folks/individual.vala
index e860b0d..a260c84 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -76,7 +76,7 @@ public class Folks.Individual : Object,
     PresenceDetails,
     PhoneDetails,
     PostalAddressDetails,
-    RoleOwner,
+    RoleDetails,
     Urlable
 {
   private bool _is_favourite;
@@ -1162,10 +1162,10 @@ public class Folks.Individual : Object,
 
       foreach (var persona in this._persona_list)
         {
-          var role_owner = persona as RoleOwner;
-          if (role_owner != null)
+          var role_details = persona as RoleDetails;
+          if (role_details != null)
             {
-              foreach (var r in role_owner.roles)
+              foreach (var r in role_details.roles)
                 {
                   if (roles.contains (r) == false)
                     {
diff --git a/folks/role-owner.vala b/folks/role-details.vala
similarity index 98%
rename from folks/role-owner.vala
rename to folks/role-details.vala
index 5e9e9c1..a370c22 100644
--- a/folks/role-owner.vala
+++ b/folks/role-details.vala
@@ -112,7 +112,7 @@ public class Folks.Role : Object
  *
  * @since 0.3.UNRELEASED
  */
-public interface Folks.RoleOwner : Object
+public interface Folks.RoleDetails : Object
 {
   /**
    * The roles of the contact.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 79dea88..1f804d3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,6 +9,6 @@ folks/backend-store.vala
 folks/im-details.vala
 folks/individual-aggregator.vala
 folks/postal-address-details.vala
-folks/role-owner.vala
+folks/role-details.vala
 tools/import-pidgin.vala
 tools/import.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 27bb02d..899fa25 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -8,6 +8,6 @@ folks/backend-store.c
 folks/im-details.c
 folks/individual-aggregator.c
 folks/postal-address-details.c
-folks/role-owner.c
+folks/role-details.c
 tools/import-pidgin.c
 tools/import.c



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