From a2e4f2a688b391cd9b0a7800ea6bb86e9194c1db Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 2 Jun 2006 17:32:19 +0000 Subject: Fix for bug 341334 svn path=/trunk/; revision=32070 --- shell/ChangeLog | 8 ++++++++ shell/e-component-registry.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'shell') 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 + + ** 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 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: -- cgit v1.2.3