key-file backend fixed to match last vala release.
authorErick Pérez Castellanos <erick.red@gmail.com>
Thu, 9 Aug 2012 18:54:04 +0000 (14:54 -0400)
committerErick Pérez Castellanos <erick.red@gmail.com>
Thu, 9 Aug 2012 18:54:04 +0000 (14:54 -0400)
Vala change:
1. Warn when accessing static members with an instance reference.

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

backends/key-file/kf-persona-store.vala
backends/key-file/kf-persona.vala

index f6d01b9..af63f14 100644 (file)
@@ -134,7 +134,7 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
    */
   public override string[] always_writeable_properties
     {
-      get { return this._always_writeable_properties; }
+      get { return Kf.PersonaStore._always_writeable_properties; }
     }
 
   /**
@@ -379,7 +379,7 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
           ? (MultiMap<string, ImFieldDetails>) val.get_object ()
           : null;
       unowned Value? val2 = details.lookup
-          (this.detail_key (PersonaDetail.WEB_SERVICE_ADDRESSES));
+          (Folks.PersonaStore.detail_key (PersonaDetail.WEB_SERVICE_ADDRESSES));
       MultiMap<string, WebServiceFieldDetails> web_service_addresses
           = val2 != null
           ? (MultiMap<string, WebServiceFieldDetails>) val2.get_object ()
index b44f517..5db01db 100644 (file)
@@ -55,7 +55,7 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
    */
   public override string[] linkable_properties
     {
-      get { return this._linkable_properties; }
+      get { return Kf.Persona._linkable_properties; }
     }
 
   /**
@@ -65,7 +65,7 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
    */
   public override string[] writeable_properties
     {
-      get { return this._writeable_properties; }
+      get { return Kf.Persona._writeable_properties; }
     }
 
   /**
@@ -312,7 +312,7 @@ public class Folks.Backends.Kf.Persona : Folks.Persona,
   public Persona (string id, Folks.PersonaStore store)
     {
       var iid = store.id + ":" + id;
-      var uid = this.build_uid ("key-file", store.id, id);
+      var uid = Folks.Persona.build_uid ("key-file", store.id, id);
 
       Object (display_id: id,
               iid: iid,