Re: [evolution-patches] Fix for bug #40995: Poor error deleting IMAP folders with subfolders

[Jeffrey Stedfast <fejj ximian com>]

uh... this will cause other bugs.

Jeff

On Thu, 2003-09-25 at 07:37, Antonio Xu wrote:
> Hello All,
> 
> Please review my patch for bug #40995? This patch is apply to 1.4 branch.
> 
> I found when camel build tree for imap folder, it aways set the child 
> folder as the parent folder's sibling folder, this problem is caused by
> name++,which cause camel couldn't build tree as the relationship of 
> parent and children. In my fix, I removed name++, that could fix this bug.
> 	
> Bug link:
>           http://bugzilla.ximian.com/show_bug.cgi?id=40995
> 
> Thanks
> Antonio Xu
> 
> 
> 
> ______________________________________________________________________
> Index: camel/camel-store.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/camel-store.c,v
> retrieving revision 1.116
> diff -u -p -r1.116 camel-store.c
> --- camel/camel-store.c	23 Apr 2003 01:34:02 -0000	1.116
> +++ camel/camel-store.c	25 Sep 2003 09:57:48 -0000
> @@ -798,8 +798,6 @@ camel_folder_info_build (GPtrArray *fold
>  			name = fi->full_name + nlen;
>  		else
>  			name = fi->full_name;
> -		if (*name == separator)
> -			name++;
>  		g_hash_table_insert (hash, g_strdup(name), fi);
>  	}
>  	
> @@ -810,8 +808,6 @@ camel_folder_info_build (GPtrArray *fold
>  			name = fi->full_name + nlen;
>  		else
>  			name = fi->full_name;
> -		if (*name == separator)
> -			name++;
>  
>  		/* set the path if it isn't already set */
>  		if (!fi->path)
> Index: camel/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
> retrieving revision 1.1836.2.11
> diff -u -p -r1.1836.2.11 ChangeLog
> --- camel/ChangeLog	31 Aug 2003 22:14:56 -0000	1.1836.2.11
> +++ camel/ChangeLog	25 Sep 2003 10:03:01 -0000
> @@ -1,3 +1,8 @@
> +2003-09-25  Antonio Xu <antonio xu sun com>
> +
> +	* camel-store.c (camel_folder_info_build): remove name++ when
> +	*name equal the separator. Fix bug #40995.
> +
>  2003-08-29  Not Zed  <NotZed Ximian com>
>  
>  	** See bug #46674.
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com