[folks] Rename PostalAddressOwner -> PostalAddressDetails



commit 27935c24c2b5f62446094c40b6459b5537c0d71f
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Mar 10 16:46:11 2011 -0800

    Rename PostalAddressOwner -> PostalAddressDetails
    
    Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named

 NEWS                                               |    4 ++--
 folks/Makefile.am                                  |    2 +-
 folks/individual.vala                              |    9 +++++----
 ...ress-owner.vala => postal-address-details.vala} |    2 +-
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/NEWS b/NEWS
index ec323b4..08d7982 100644
--- a/NEWS
+++ b/NEWS
@@ -22,8 +22,8 @@ API changes:
 * Add RoleOwner interface
 * Add BirthdayDetails interface
 * Add NoteDetails interface
-* Add PostalAddressOwner interface
-* Add PostalAddressOwner.uid as a convenience for backends
+* Add PostalAddressDetails interface
+* Add PostalAddressDetails.uid as a convenience for backends
 * Add PostalAddress.equal()
 * Add PostalAddress.to_string()
 * Add RoleOwner.to_string()
diff --git a/folks/Makefile.am b/folks/Makefile.am
index efa0258..ad76e54 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -26,13 +26,13 @@ libfolks_la_SOURCES = \
 	name-details.vala \
 	note-details.vala \
 	phone-details.vala \
+	postal-address-details.vala \
 	presence-owner.vala \
 	individual.vala \
 	individual-aggregator.vala \
 	linked-hash-set.vala \
 	persona.vala \
 	persona-store.vala \
-	postal-address-owner.vala \
 	types.vala \
 	urlable.vala \
 	debug.vala \
diff --git a/folks/individual.vala b/folks/individual.vala
index d1f3f63..fc8a599 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -75,7 +75,7 @@ public class Folks.Individual : Object,
     NoteDetails,
     PresenceOwner,
     PhoneDetails,
-    PostalAddressOwner,
+    PostalAddressDetails,
     RoleOwner,
     Urlable
 {
@@ -1185,10 +1185,11 @@ public class Folks.Individual : Object,
       /* FIXME: Detect duplicates somehow? */
       foreach (var persona in this._persona_list)
         {
-          var address_owner = persona as PostalAddressOwner;
-          if (address_owner != null)
+          var address_details = persona as PostalAddressDetails;
+          if (address_details != null)
             {
-              foreach (unowned PostalAddress pa in address_owner.postal_addresses)
+              foreach (unowned PostalAddress pa in
+                  address_details.postal_addresses)
                 this._postal_addresses.append (pa);
             }
         }
diff --git a/folks/postal-address-owner.vala b/folks/postal-address-details.vala
similarity index 99%
rename from folks/postal-address-owner.vala
rename to folks/postal-address-details.vala
index fc73134..d1a67bf 100644
--- a/folks/postal-address-owner.vala
+++ b/folks/postal-address-details.vala
@@ -225,7 +225,7 @@ public class Folks.PostalAddress : Object
  * Interface for classes that can provide postal addresses, such as
  * { link Persona} and { link Individual}.
  */
-public interface Folks.PostalAddressOwner : Object
+public interface Folks.PostalAddressDetails : Object
 {
   /**
    * The postal addresses of the contact.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ab87edc..79dea88 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,7 @@ backends/telepathy/lib/tpf-persona.vala
 folks/backend-store.vala
 folks/im-details.vala
 folks/individual-aggregator.vala
-folks/postal-address-owner.vala
+folks/postal-address-details.vala
 folks/role-owner.vala
 tools/import-pidgin.vala
 tools/import.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index cf054ec..27bb02d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -7,7 +7,7 @@ docs/gtk-doc/folks-telepathy/ccomments/tp-lowlevel.c
 folks/backend-store.c
 folks/im-details.c
 folks/individual-aggregator.c
-folks/postal-address-owner.c
+folks/postal-address-details.c
 folks/role-owner.c
 tools/import-pidgin.c
 tools/import.c



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