diff options
| author | Jeff Cai <jeff.cai@sun.com> | 2005-12-08 06:44:37 +0000 |
|---|---|---|
| committer | Harry Lu <haip@src.gnome.org> | 2005-12-08 06:44:37 +0000 |
| commit | 1ce010ee48710e3a68a6de21806379ad92c1531d (patch) | |
| tree | f9161f3e85facfa3d6272c4d709c47a7594f36da | |
| parent | 6ac50d3f81a90f2b86c7aeb707ac7f51fe573da3 (diff) | |
| download | evolution-data-server-1ce010ee48710e3a68a6de21806379ad92c1531d.tar.gz | |
if search expression of a vfolder is null, make it an empty string. Fix
2005-12-07 Jeff Cai <jeff.cai@sun.com>
* camel-vee-folder.c: (vee_search_by_expression),
(vee_search_by_uids):
if search expression of a vfolder is null, make it an empty string.
Fix #323433
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-vee-folder.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index f80972671..72d6f33a4 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2005-12-07 Jeff Cai <jeff.cai@sun.com> + + * camel-vee-folder.c: (vee_search_by_expression), + (vee_search_by_uids): + if search expression of a vfolder is null, make it an empty string. + Fix #323433 + 2005-12-01 Shi Pu <shi.pu@sun.com> ** See bug #321139 diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c index d6faeb131..6c95ba364 100644 --- a/camel/camel-vee-folder.c +++ b/camel/camel-vee-folder.c @@ -535,7 +535,7 @@ vee_search_by_expression(CamelFolder *folder, const char *expression, CamelExcep CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock); if (vf != folder_unmatched) - expr = g_strdup_printf ("(and %s %s)", vf->expression, expression); + expr = g_strdup_printf ("(and %s %s)", vf->expression ? vf->expression : "", expression); else expr = g_strdup (expression); @@ -587,7 +587,7 @@ vee_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock); - expr = g_strdup_printf("(and %s %s)", vf->expression, expression); + expr = g_strdup_printf("(and %s %s)", vf->expression ? vf->expression : "", expression); node = p->folders; while (node) { CamelFolder *f = node->data; |