Rename Alias interface to Aliasable

Helps: bgo#627397

diff --git a/backends/key-file/kf-persona.vala b/backends/key-file/kf-persona.vala
index 5986cb0..31416b0 100644 (file)
--- 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,
-    Alias,
+    Aliasable,
     IMable
 {
   private unowned GLib.KeyFile key_file;

diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
index 2e95ef5..6ecff9b 100644 (file)
--- a/backends/telepathy/lib/tpf-persona.vala
+++ b/backends/telepathy/lib/tpf-persona.vala
@@ -33,7 +33,7 @@ public errordomain Tpf.PersonaError
  * Telepathy.
  */
 public class Tpf.Persona : Folks.Persona,
-    Alias,
+    Aliasable,
     Avatar,
     Favourite,
     Groupable,

diff --git a/folks/Makefile.am b/folks/Makefile.am
index 35fa24b..459977f 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libfolks.la
 
 # Vala files to compile into libfolks.la
 folks_valasources = \
-       alias.vala \
+       aliasable.vala \
        avatar.vala \
        backend.vala \
        backend-store.vala \

diff --git a/folks/alias.vala b/folks/aliasable.vala
similarity index 96%
rename from folks/alias.vala
rename to folks/aliasable.vala
index c6f756b..9a11162 100644 (file)
--- a/folks/alias.vala
+++ b/folks/aliasable.vala
@@ -24,7 +24,7 @@ using GLib;
  * Interface for classes which represent aliasable contacts, such as
  * {@link Persona} and {@link Individual}.
  */
-public interface Folks.Alias : Object
+public interface Folks.Aliasable : Object
 {
   /**
    * An alias for the contact.

diff --git a/folks/individual.vala b/folks/individual.vala
index ce50a2f..396f64c 100644 (file)
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -64,7 +64,7 @@ public enum Folks.TrustLevel
  * might have, such as their different IM addresses or vCard entries.
  */
 public class Folks.Individual : Object,
-    Alias,
+    Aliasable,
     Avatar,
     Favourite,
     Groupable,
@@ -157,11 +157,11 @@ public class Folks.Individual : Object,
           bool alias_changed = false;
           this._persona_list.foreach ((p) =>
             {
-              if (p is Alias && ((Persona) p).store.is_writeable == true)
+              if (p is Aliasable && ((Persona) p).store.is_writeable == true)
                 {
                   debug ("    written to writeable persona '%s'",
                       ((Persona) p).uid);
-                  ((Alias) p).alias = value;
+                  ((Aliasable) p).alias = value;
                   alias_changed = true;
                 }
             });
@@ -172,11 +172,11 @@ public class Folks.Individual : Object,
             {
               this._persona_list.foreach ((p) =>
                 {
-                  if (p is Alias)
+                  if (p is Aliasable)
                     {
                       debug ("    written to non-writeable persona '%s'",
                           ((Persona) p).uid);
-                      ((Alias) p).alias = value;
+                      ((Aliasable) p).alias = value;
                     }
                 });
             }
@@ -527,9 +527,9 @@ public class Folks.Individual : Object,
        * stored. */
       foreach (Persona p in this._persona_list)
         {
-          if (p is Alias && p.store.is_writeable == true)
+          if (p is Aliasable && p.store.is_writeable == true)
             {
-              unowned Alias a = (Alias) p;
+              unowned Aliasable a = (Aliasable) p;
 
               if (a.alias != null && a.alias.strip () != "")
                 {
@@ -549,9 +549,9 @@ public class Folks.Individual : Object,
         {
           foreach (Persona p in this._persona_list)
             {
-              if (p is Alias)
+              if (p is Aliasable)
                 {
-                  unowned Alias a = (Alias) p;
+                  unowned Aliasable a = (Aliasable) p;
 
                   if (a.alias == null || a.alias.strip () == "")
                     continue;

diff --git a/tools/import-pidgin.vala b/tools/import-pidgin.vala
index f224bcd..17ca53c 100644 (file)
--- a/tools/import-pidgin.vala
+++ b/tools/import-pidgin.vala
@@ -237,8 +237,8 @@ public class Folks.Importers.Pidgin : Folks.Importer
         }
 
       /* Set the Persona's details */
-      if (alias != null && persona is Alias)
-        ((Alias) persona).alias = alias;
+      if (alias != null && persona is Aliasable)
+        ((Aliasable) persona).alias = alias;
 
       /* Print progress */
       stdout.printf ("Created persona '%s' for buddy with alias '%s' and IM " +