[folks] Rename NameOwner -> NameDetails



commit bb99bfe38e36de6a01cbdf351b1f215f99c90bfa
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Thu Mar 10 16:30:05 2011 -0800

    Rename NameOwner -> NameDetails
    
    Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named

 NEWS                                         |    1 +
 folks/Makefile.am                            |    2 +-
 folks/individual.vala                        |   20 ++++++++++----------
 folks/{name-owner.vala => name-details.vala} |    2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/NEWS b/NEWS
index 88cea4f..42aee36 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ API changes:
 * Rename GenderOwner -> GenderDetails
 * Rename Groupable -> GroupDetails
 * Rename IMable -> ImDetails
+* Rename NameOwner -> NameDetails
 
 Overview of changes from libfolks 0.3.5 to libfolks 0.3.6
 =========================================================
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 01e4924..919e2ac 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -23,11 +23,11 @@ libfolks_la_SOURCES = \
 	gender-details.vala \
 	group-details.vala \
 	im-details.vala \
+	name-details.vala \
 	presence-owner.vala \
 	individual.vala \
 	individual-aggregator.vala \
 	linked-hash-set.vala \
-	name-owner.vala \
 	persona.vala \
 	persona-store.vala \
 	phoneable.vala \
diff --git a/folks/individual.vala b/folks/individual.vala
index 9e23999..05d530b 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -71,7 +71,7 @@ public class Folks.Individual : Object,
     GenderDetails,
     GroupDetails,
     ImDetails,
-    NameOwner,
+    NameDetails,
     NoteOwner,
     PresenceOwner,
     Phoneable,
@@ -947,10 +947,10 @@ public class Folks.Individual : Object,
     {
       foreach (var persona in this._persona_list)
         {
-          var name_owner = persona as NameOwner;
-          if (name_owner != null)
+          var name_details = persona as NameDetails;
+          if (name_details != null)
             {
-              var new_value = name_owner.structured_name;
+              var new_value = name_details.structured_name;
               if (new_value != null)
                 {
                   if (new_value != this.structured_name)
@@ -966,10 +966,10 @@ public class Folks.Individual : Object,
     {
       foreach (var persona in this._persona_list)
         {
-          var name_owner = persona as NameOwner;
-          if (name_owner != null)
+          var name_details = persona as NameDetails;
+          if (name_details != null)
             {
-              var new_value = name_owner.full_name;
+              var new_value = name_details.full_name;
               if (new_value != null)
                 {
                   if (new_value != this.full_name)
@@ -985,10 +985,10 @@ public class Folks.Individual : Object,
     {
       foreach (var persona in this._persona_list)
         {
-          var name_owner = persona as NameOwner;
-          if (name_owner != null)
+          var name_details = persona as NameDetails;
+          if (name_details != null)
             {
-              var new_value = name_owner.nickname;
+              var new_value = name_details.nickname;
               if (new_value != null)
                 {
                   if (new_value != this._nickname)
diff --git a/folks/name-owner.vala b/folks/name-details.vala
similarity index 99%
rename from folks/name-owner.vala
rename to folks/name-details.vala
index 1aaa1f1..f4a42ad 100644
--- a/folks/name-owner.vala
+++ b/folks/name-details.vala
@@ -170,7 +170,7 @@ public class Folks.StructuredName : Object
  *
  * @since 0.3.5
  */
-public interface Folks.NameOwner : Object
+public interface Folks.NameDetails : Object
 {
   /**
    * The contact name split in its constituent parts.



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