aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-component-registry.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f7ebfa58ce..ca7074a405 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #341334
+
+ * e-component-registry.c: (e_component_registry_peek_info): Check for
+ the presence of the fields before comparing. Exchange component wont
+ have these alias/etc.
+
2006-05-15 Li Yuan <li.yuan@sun.com>
Fixes #341525
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index fd820fdbcb..12ccd82c5a 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -314,11 +314,11 @@ e_component_registry_peek_info (EComponentRegistry *registry,
switch (field) {
case ECR_FIELD_ID:
- if (strcmp (info->id, key) == 0)
+ if (info->id && (strcmp (info->id, key) == 0))
return info;
break;
case ECR_FIELD_ALIAS:
- if (strcmp (info->alias, key) == 0)
+ if (info->alias && (strcmp (info->alias, key) == 0))
return info;
break;
case ECR_FIELD_SCHEMA: