Committing on behalf of Chenthill Palanisamy <pchenthill@novell.com>

2008-06-16  Chenthill Palanisamy  <pchenthill@novell.com>

        ** Fixes #394654 (bnc)

         * e-gw-item.c: (e_gw_item_init), (set_contact_fields_from_soap_parameter),
         (set_organization_fields_from_soap_parameter): Fixes a EDS crasher.

svn path=/trunk/; revision=8982

diff --git a/servers/groupwise/ChangeLog b/servers/groupwise/ChangeLog
index 46ee22a..828d70f 100644 (file)
--- a/servers/groupwise/ChangeLog
+++ b/servers/groupwise/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-16  Chenthill Palanisamy  <pchenthill@novell.com>
+
+       ** Fixes #394654 (bnc)
+
+       * e-gw-item.c: (e_gw_item_init),
+       (set_contact_fields_from_soap_parameter),
+       (set_organization_fields_from_soap_parameter): Fixes a EDS crasher.
+
 2008-06-12  Tor Lillqvist  <tml@novell.com>
 
        * Makefile.am (libegroupwise_1_2_la_LIBADD): Link with

diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index f19f9bf..12d211a 100644 (file)
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -543,7 +543,7 @@ e_gw_item_init (EGwItem *item, EGwItemClass *klass)
        priv->attach_list = NULL ;
        priv->simple_fields = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
        priv->full_name = g_new0(FullName, 1);
-       priv->addresses = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_postal_address);
+       priv->addresses = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, free_postal_address);
        priv->additions = g_hash_table_new(g_str_hash, g_str_equal);
        priv->updates =   g_hash_table_new (g_str_hash, g_str_equal);
        priv->deletions = g_hash_table_new (g_str_hash, g_str_equal);
@@ -1277,7 +1277,7 @@ set_contact_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
                                add = "Other";
 
                        if (value)
-                               g_hash_table_insert (item->priv->addresses, (char*)add, address);
+                               g_hash_table_insert (item->priv->addresses, (char *) add, address);
                        else
                                free_postal_address (address);
                        g_free (value);
@@ -1411,7 +1411,7 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
        if (subparam) {
                address = g_new0 (PostalAddress, 1);
                set_postal_address_from_soap_parameter (address, subparam);
-               g_hash_table_insert (item->priv->addresses, g_strdup ("Office"), address);
+               g_hash_table_insert (item->priv->addresses, "Office", address);
 
        }