[folks] Rename Aliasable -> AliasDetails
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Rename Aliasable -> AliasDetails
- Date: Fri, 11 Mar 2011 19:36:59 +0000 (UTC)
commit b6a398ccf36e54ec9d45b9478538bbeff6d74ea8
Author: Travis Reitter <travis reitter collabora co uk>
Date: Thu Mar 10 11:55:07 2011 -0800
Rename Aliasable -> AliasDetails
Helps bgo#642513 - Folks "Owner" interfaces are awkwardly-named
NEWS | 1 +
backends/key-file/kf-persona.vala | 2 +-
backends/telepathy/lib/tpf-persona.vala | 4 ++--
folks/Makefile.am | 2 +-
folks/{aliasable.vala => alias-details.vala} | 2 +-
folks/individual.vala | 19 ++++++++++---------
folks/name-owner.vala | 2 +-
tools/import-pidgin.vala | 4 ++--
8 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/NEWS b/NEWS
index 660e2a9..d564b68 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ API changes:
* Add PostalAddress.equal()
* Add PostalAddress.to_string()
* Add RoleOwner.to_string()
+* Rename Aliasable -> AliasDetails
Overview of changes from libfolks 0.3.5 to libfolks 0.3.6
=========================================================
diff --git a/backends/key-file/kf-persona.vala b/backends/key-file/kf-persona.vala
index 1c338f8..9588b7e 100644
--- a/backends/key-file/kf-persona.vala
+++ b/backends/key-file/kf-persona.vala
@@ -29,7 +29,7 @@ using Folks.Backends.Kf;
* @since 0.1.13
*/
public class Folks.Backends.Kf.Persona : Folks.Persona,
- Aliasable,
+ AliasDetails,
IMable
{
private unowned GLib.KeyFile _key_file;
diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index 1bf2b67..45befc6 100644
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -28,7 +28,7 @@ using Folks;
* Telepathy.
*/
public class Tpf.Persona : Folks.Persona,
- Aliasable,
+ AliasDetails,
Favouritable,
Groupable,
AvatarOwner,
@@ -93,7 +93,7 @@ public class Tpf.Persona : Folks.Persona,
/**
* An alias for the Persona.
*
- * See { link Folks.Aliasable.alias}.
+ * See { link Folks.AliasDetails.alias}.
*/
public string alias
{
diff --git a/folks/Makefile.am b/folks/Makefile.am
index f2f4967..c24b9c1 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libfolks.la
# Vala files to compile into libfolks.la
libfolks_la_SOURCES = \
- aliasable.vala \
+ alias-details.vala \
backend.vala \
backend-store.vala \
emailable.vala \
diff --git a/folks/aliasable.vala b/folks/alias-details.vala
similarity index 96%
rename from folks/aliasable.vala
rename to folks/alias-details.vala
index 9a11162..dce661c 100644
--- a/folks/aliasable.vala
+++ b/folks/alias-details.vala
@@ -24,7 +24,7 @@ using GLib;
* Interface for classes which represent aliasable contacts, such as
* { link Persona} and { link Individual}.
*/
-public interface Folks.Aliasable : Object
+public interface Folks.AliasDetails : Object
{
/**
* An alias for the contact.
diff --git a/folks/individual.vala b/folks/individual.vala
index 5e86351..1ee857b 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -63,7 +63,7 @@ public enum Folks.TrustLevel
* might have, such as their different IM addresses or vCard entries.
*/
public class Folks.Individual : Object,
- Aliasable,
+ AliasDetails,
AvatarOwner,
BirthdayOwner,
Emailable,
@@ -196,11 +196,12 @@ public class Folks.Individual : Object,
var alias_changed = false;
this._persona_list.foreach ((p) =>
{
- if (p is Aliasable && ((Persona) p).store.is_writeable == true)
+ if (p is AliasDetails &&
+ ((Persona) p).store.is_writeable == true)
{
debug (" written to writeable persona '%s'",
((Persona) p).uid);
- ((Aliasable) p).alias = value;
+ ((AliasDetails) p).alias = value;
alias_changed = true;
}
});
@@ -211,11 +212,11 @@ public class Folks.Individual : Object,
{
this._persona_list.foreach ((p) =>
{
- if (p is Aliasable)
+ if (p is AliasDetails)
{
debug (" written to non-writeable persona '%s'",
((Persona) p).uid);
- ((Aliasable) p).alias = value;
+ ((AliasDetails) p).alias = value;
}
});
}
@@ -779,9 +780,9 @@ public class Folks.Individual : Object,
* stored. */
foreach (var p in this._persona_list)
{
- if (p is Aliasable && p.store.is_writeable == true)
+ if (p is AliasDetails && p.store.is_writeable == true)
{
- var a = (Aliasable) p;
+ var a = (AliasDetails) p;
if (a.alias != null && a.alias.strip () != "")
{
@@ -801,9 +802,9 @@ public class Folks.Individual : Object,
{
foreach (var p in this._persona_list)
{
- if (p is Aliasable)
+ if (p is AliasDetails)
{
- var a = (Aliasable) p;
+ var a = (AliasDetails) p;
if (a.alias == null || a.alias.strip () == "")
continue;
diff --git a/folks/name-owner.vala b/folks/name-owner.vala
index f712388..1aaa1f1 100644
--- a/folks/name-owner.vala
+++ b/folks/name-owner.vala
@@ -203,7 +203,7 @@ public interface Folks.NameOwner : Object
* The nickname of the contact.
*
* The nickname is the name that the contact chose for himself. This is
- * different from { link Aliasable.alias} as aliases can be chosen by
+ * different from { link AliasDetails.alias} as aliases can be chosen by
* the user and not by the contacts themselves.
*
* @since 0.3.5
diff --git a/tools/import-pidgin.vala b/tools/import-pidgin.vala
index 26579f3..5387f4b 100644
--- a/tools/import-pidgin.vala
+++ b/tools/import-pidgin.vala
@@ -254,8 +254,8 @@ public class Folks.Importers.Pidgin : Folks.Importer
}
/* Set the Persona's details */
- if (alias != null && persona is Aliasable)
- ((Aliasable) persona).alias = alias;
+ if (alias != null && persona is AliasDetails)
+ ((AliasDetails) persona).alias = alias;
/* Print progress */
stdout.printf (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]