summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSankar P <psankar@novell.com>2009-02-02 08:58:12 +0000
committerSankarasivasubramanian Pasupathilingam <psankar@src.gnome.org>2009-02-02 08:58:12 +0000
commitc8f2f449a71b3e7c7aa05e9778610906538a6df9 (patch)
tree0c091745434e5be9eeb600b7e9bbd827c35fca89
parent60cc3376e45e95bb77fa7d67f61d2d766fd54424 (diff)
downloadevolution-data-server-c8f2f449a71b3e7c7aa05e9778610906538a6df9.tar.gz
** Part of fix for bnc bug #470143
2009-02-02 Sankar P <psankar@novell.com> ** Part of fix for bnc bug #470143 * servers/groupwise/e-gw-container.c: Handle a broken server response with GroupWise 7.x server svn path=/branches/gnome-2-24/; revision=10025
-rw-r--r--servers/groupwise/ChangeLog8
-rw-r--r--servers/groupwise/e-gw-container.c25
2 files changed, 21 insertions, 12 deletions
diff --git a/servers/groupwise/ChangeLog b/servers/groupwise/ChangeLog
index d1f9c4aed..47a66e34e 100644
--- a/servers/groupwise/ChangeLog
+++ b/servers/groupwise/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-02 Sankar P <psankar@novell.com>
+
+ ** Part of fix for bnc bug #470143
+
+ * servers/groupwise/e-gw-container.c:
+ Handle a broken server response with
+ GroupWise 7.x server
+
2009-01-28 Sankar P <psankar@novell.com>
** Fix for bnc bug #470143
diff --git a/servers/groupwise/e-gw-container.c b/servers/groupwise/e-gw-container.c
index cfca8c761..6499aa59d 100644
--- a/servers/groupwise/e-gw-container.c
+++ b/servers/groupwise/e-gw-container.c
@@ -205,25 +205,26 @@ e_gw_container_set_from_soap_parameter (EGwContainer *container, SoupSoapParamet
/* retrieve the name */
subparam = soup_soap_parameter_get_first_child_by_name (param, "name");
if (!subparam) {
- g_warning (G_STRLOC ": found container with no name");
- return FALSE;
+ /* GroupWise 7.X servers does not return the name field.
+ This is not an issue with Bonsai 8.X . So, keep this code for
+ working well with the broken GW 7.X series */
+ e_gw_container_set_name (container, "");
+ } else {
+ value = soup_soap_parameter_get_string_value (subparam);
+ e_gw_container_set_name (container, (const char *) value);
+ g_free (value);
}
- value = soup_soap_parameter_get_string_value (subparam);
- e_gw_container_set_name (container, (const char *) value);
- g_free (value);
-
/* retrieve the ID */
subparam = soup_soap_parameter_get_first_child_by_name (param, "id");
if (!subparam) {
- g_warning (G_STRLOC ": found container with no ID");
- return FALSE;
+ e_gw_container_set_id (container, "");
+ } else {
+ value = soup_soap_parameter_get_string_value (subparam);
+ e_gw_container_set_id (container, (const char *) value);
+ g_free (value);
}
- value = soup_soap_parameter_get_string_value (subparam);
- e_gw_container_set_id (container, (const char *) value);
- g_free (value);
-
/* retrieve the parent container id */
subparam = soup_soap_parameter_get_first_child_by_name (param, "parent");
if (!subparam) {