eds backend fixed to match last vala release.

Vala change:
1. Warn when accessing static members with an instance reference.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=681420

diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index b758020..a482ae2 100644 (file)
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -261,7 +261,7 @@ public class Folks.Backends.Eds.Backend : Folks.Backend
   private string[] _get_addressbooks_from_env ()
     {
       string[] addressbooks = {};
-      string ab_list = Environment.get_variable (this._use_address_books);
+      string ab_list = Environment.get_variable (Backend._use_address_books);
 
       if (ab_list != null && ab_list != "")
         {

diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index c18af4a..4ea2ecb 100644 (file)
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -175,7 +175,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
           if (this._addressbook == null ||
               ((!) this._addressbook).readonly == true)
             {
-              return this._always_writeable_properties_empty;
+              return PersonaStore._always_writeable_properties_empty;
             }
 
           return this._always_writeable_properties;
@@ -1270,7 +1270,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
            * above. */
           yield ((!) this._addressbook).modify_contact (contact, null);
 
-          timeout_id = Timeout.add_seconds (this._property_change_timeout, () =>
+          timeout_id = Timeout.add_seconds (PersonaStore._property_change_timeout, () =>
             {
               /* Failure! Return to _commit_modified_property() without setting
                * received_notification. */
@@ -2073,7 +2073,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
       Set<string> anti_links)
     {
       var vcard = (E.VCard) contact;
-      vcard.remove_attributes (null, this.anti_links_attribute_name);
+      vcard.remove_attributes (null, PersonaStore.anti_links_attribute_name);
 
       var persona_uid =
           Folks.Persona.build_uid (BACKEND_NAME, this.id, contact.id);
@@ -2087,7 +2087,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
             }
 
           var attr = new E.VCardAttribute (null,
-              this.anti_links_attribute_name);
+              PersonaStore.anti_links_attribute_name);
           attr.add_value (anti_link_uid);
 
           contact.add_attribute ((owned) attr);

diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index c4883e9..1310256 100644 (file)
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -326,7 +326,7 @@ public class Edsf.Persona : Folks.Persona,
    */
   public override string[] linkable_properties
     {
-      get { return this._linkable_properties; }
+      get { return Persona._linkable_properties; }
     }
 
   /**
@@ -762,7 +762,7 @@ public class Edsf.Persona : Folks.Persona,
           Edsf.Persona._get_property_from_contact<string> (contact, "id");
       var contact_id = (!) (_contact_id ?? "");
 
-      var uid = this.build_uid (BACKEND_NAME, store.id, contact_id);
+      var uid = Folks.Persona.build_uid (BACKEND_NAME, store.id, contact_id);
       var iid = Edsf.Persona.build_iid (store.id, contact_id);
       var is_user = BookClient.is_self (contact);
       var _full_name =
@@ -979,7 +979,7 @@ public class Edsf.Persona : Folks.Persona,
            * by the BirthdayDetails interface.
            * We cache the timezone since creating it requires mmapping
            * /etc/localtime, which means lots of syscalls. */
-          var d = new DateTime (this._local_time_zone,
+          var d = new DateTime (Persona._local_time_zone,
               (int) bday.year, (int) bday.month, (int) bday.day, 0, 0, 0.0);
           if (this._birthday == null ||
               (this._birthday != null &&
@@ -1349,7 +1349,7 @@ public class Edsf.Persona : Folks.Persona,
       var new_urls = new HashSet<UrlFieldDetails> ();
 
       /* First we get the standard Evo urls.. */
-      foreach (var mapping in this._url_properties)
+      foreach (var mapping in Persona._url_properties)
         {
           var url_property = mapping.vcard_field_name;
           var folks_type = mapping.folks_type;
@@ -1358,7 +1358,7 @@ public class Edsf.Persona : Folks.Persona,
           if (u != null && u != "")
             {
               var fd_u = new UrlFieldDetails ((!) u);
-              fd_u.set_parameter (fd_u.PARAM_TYPE, folks_type);
+              fd_u.set_parameter (AbstractFieldDetails.PARAM_TYPE, folks_type);
               new_urls.add (fd_u);
             }
         }
@@ -1391,7 +1391,7 @@ public class Edsf.Persona : Folks.Persona,
 
   private void _update_im_addresses ()
     {
-      var im_eds_map = this._get_im_eds_map ();
+      var im_eds_map = Persona._get_im_eds_map ();
       var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
           null, (GLib.HashFunc) ImFieldDetails.hash,
           (GLib.EqualFunc) ImFieldDetails.equal);