Bug 672373 — folks-import segfaults (Archlinux x86_64)

Fix a GValue boxed-type-mismatch between folks-import and ImDetails which
was causing crashes.

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

diff --git a/NEWS b/NEWS
index 6cdf0bc..269f9f8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugs fixed:
 * Bug 661490 — Should mark contacts from the "Starred in Android" group as
   Favorites
 * Bug 671714 — Fail to add contact to the contact list
+* Bug 672373 — folks-import segfaults (Archlinux x86_64)
 
 Overview of changes from libfolks 0.6.6 to libfolks 0.6.7
 =============================================================

diff --git a/tools/import-pidgin.vala b/tools/import-pidgin.vala
index e6458dd..2240038 100644 (file)
--- a/tools/import-pidgin.vala
+++ b/tools/import-pidgin.vala
@@ -169,7 +169,7 @@ public class Folks.Importers.Pidgin : Folks.Importer
   private async Persona? parse_contact (Xml.Node *contact_node)
     {
       string alias = null;
-      var im_addresses = new HashMultiMap<string, string> ();
+      var im_addresses = new HashMultiMap<string, ImFieldDetails> ();
       string im_address_string = "";
 
       /* Parse the <buddy> elements beneath <contact> */
@@ -203,7 +203,8 @@ public class Folks.Importers.Pidgin : Folks.Importer
                    * we need to insert into the Persona's im-addresses property
                    * for the linking to work. */
                   string im_address = subiter->get_content ();
-                  im_addresses.set (tp_protocol, im_address);
+                  im_addresses.set (tp_protocol,
+                      new ImFieldDetails (im_address));
                   im_address_string += "    %s\n".printf (im_address);
                 }
             }