[folks] Rename AvatarOwner -> AvatarDetails
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Rename AvatarOwner -> AvatarDetails
- Date: Fri, 11 Mar 2011 19:37:04 +0000 (UTC)
commit e6782e4fad7e3d9399ba5a38555a4fb9da8b0017
Author: Travis Reitter <travis reitter collabora co uk>
Date: Thu Mar 10 15:32:27 2011 -0800
Rename AvatarOwner -> AvatarDetails
Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named
NEWS | 1 +
backends/telepathy/lib/tpf-persona.vala | 4 ++--
folks/Makefile.am | 2 +-
folks/{avatar-owner.vala => avatar-details.vala} | 2 +-
folks/individual.vala | 6 +++---
5 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/NEWS b/NEWS
index d564b68..59eee79 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ API changes:
* Add PostalAddress.to_string()
* Add RoleOwner.to_string()
* Rename Aliasable -> AliasDetails
+* Rename AvatarOwner -> AvatarDetails
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 45befc6..7bdb4b4 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -29,9 +29,9 @@ using Folks;
*/
public class Tpf.Persona : Folks.Persona,
AliasDetails,
+ AvatarDetails,
Favouritable,
Groupable,
- AvatarOwner,
PresenceOwner,
IMable
{
@@ -62,7 +62,7 @@ public class Tpf.Persona : Folks.Persona,
/**
* An avatar for the Persona.
*
- * See { link Folks.AvatarOwner.avatar}.
+ * See { link Folks.AvatarDetails.avatar}.
*/
public File avatar { get; set; }
diff --git a/folks/Makefile.am b/folks/Makefile.am
index c24b9c1..9a63912 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -13,6 +13,7 @@ lib_LTLIBRARIES = libfolks.la
# Vala files to compile into libfolks.la
libfolks_la_SOURCES = \
alias-details.vala \
+ avatar-details.vala \
backend.vala \
backend-store.vala \
emailable.vala \
@@ -20,7 +21,6 @@ libfolks_la_SOURCES = \
field-details.vala \
gender-owner.vala \
groupable.vala \
- avatar-owner.vala \
presence-owner.vala \
imable.vala \
individual.vala \
diff --git a/folks/avatar-owner.vala b/folks/avatar-details.vala
similarity index 96%
rename from folks/avatar-owner.vala
rename to folks/avatar-details.vala
index f50868b..f9732b9 100644
--- a/folks/avatar-owner.vala
+++ b/folks/avatar-details.vala
@@ -24,7 +24,7 @@ using GLib;
* Interface for classes which represent contacts which have an avatar
* (pictorial representation), such as { link Persona} and { link Individual}.
*/
-public interface Folks.AvatarOwner : Object
+public interface Folks.AvatarDetails : Object
{
/**
* An avatar for the contact.
diff --git a/folks/individual.vala b/folks/individual.vala
index 1ee857b..7a71be3 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -64,7 +64,7 @@ public enum Folks.TrustLevel
*/
public class Folks.Individual : Object,
AliasDetails,
- AvatarOwner,
+ AvatarDetails,
BirthdayOwner,
Emailable,
Favouritable,
@@ -858,9 +858,9 @@ public class Folks.Individual : Object,
this._persona_list.foreach ((p) =>
{
- if (avatar == null && p is AvatarOwner)
+ if (avatar == null && p is AvatarDetails)
{
- avatar = ((AvatarOwner) p).avatar;
+ avatar = ((AvatarDetails) p).avatar;
return;
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]