backends: Fix calls to ImDetails.normalise_im_address()

Newer versions of the Vala compiler have got stricter about unnecessary
(owned) transfer annotations. Folks had some unnecessary ones, which
have now been removed. This shouldn’t affect compilation with older
versions of Vala, though this is untested.

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

Conflicts:
	NEWS

(cherry picked from commit c9a9472927a)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 5f3ff0a..5d3c028 100644 (file)
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -1660,7 +1660,7 @@ public class Edsf.Persona : Folks.Persona,
                     }
 
                   string normalised_addr =
-                    (owned) ImDetails.normalise_im_address ((!) addr, im_proto);
+                    ImDetails.normalise_im_address ((!) addr, im_proto);
 
                   if (normalised_addr == "")
                     {
@@ -1717,7 +1717,7 @@ public class Edsf.Persona : Folks.Persona,
               try
                 {
                   string normalised_addr =
-                    (owned) ImDetails.normalise_im_address (email.value, proto);
+                    ImDetails.normalise_im_address (email.value, proto);
                   var im_fd = new ImFieldDetails (normalised_addr);
                   new_im_addresses.set (proto, im_fd);
                 }

diff --git a/backends/libsocialweb/lib/swf-persona.vala b/backends/libsocialweb/lib/swf-persona.vala
index 1c22608..33e5089 100644 (file)
--- a/backends/libsocialweb/lib/swf-persona.vala
+++ b/backends/libsocialweb/lib/swf-persona.vala
@@ -278,9 +278,8 @@ public class Swf.Persona : Folks.Persona,
         {
           try
             {
-              var facebook_jid_copy = facebook_jid.dup();
-              var normalised_addr = (owned) normalise_im_address
-                  ((owned) facebook_jid_copy, "jabber");
+              var normalised_addr = ImDetails.normalise_im_address
+                  (facebook_jid, "jabber");
               string im_proto = "jabber";
               var im_fd = new ImFieldDetails (normalised_addr);
 

diff --git a/backends/tracker/lib/trf-persona.vala b/backends/tracker/lib/trf-persona.vala
index dcb37fa..24bcfc5 100644 (file)
--- a/backends/tracker/lib/trf-persona.vala
+++ b/backends/tracker/lib/trf-persona.vala
@@ -1152,9 +1152,8 @@ public class Trf.Persona : Folks.Persona,
     {
       try
         {
-          var account_id_copy = account_id.dup ();
-          var normalised_addr = (owned) normalise_im_address
-              ((owned) account_id_copy, im_proto);
+          var normalised_addr = ImDetails.normalise_im_address
+              (account_id, im_proto);
           var im_fd = new ImFieldDetails (normalised_addr);
 
           this._im_addresses.set (im_proto, im_fd);