=?utf-8?q?=5Bfolks=5D_Bug_672373_=E2=80=94_folks-import_segfaults_=28Arch?= =?utf-8?q?linux_x86=5F64=29?=



commit 5811fd7c860e21a3f8d7cb1bf9b564d444e7e409
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Mar 24 17:55:32 2012 +0000

    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

 NEWS                     |    1 +
 tools/import-pidgin.vala |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6cdf0bc..269f9f8 100644
--- 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
--- 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);
                 }
             }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]