Re: [evolution-patches] Patch to fix crash when expanding "On this Computer" in mailer

[Rodney Dawes <dobey ximian com>]

On Tue, 2004-02-24 at 00:43, Not Zed wrote:
> On Tue, 2004-02-24 at 00:52 -0500, Rodney Dawes wrote:
> 
> > This patch fixes the much disputed crashing in the treeview without
> 
> I'm not sure this patch will affect the issue anyway, since its got
> nothign to do with subfolders, empty or otherwise.  Only the top-level
> folder being expanded by the code *while* the animation is still running
> after the user expanded it.

Hrmm. That doesn't seem right, since the if statement is recursing.

> > patching gtk+, as we are doing the wrong thing in camel also, when
> > loading local folders that don't actually have children, but we force
> > the CAMEL_FOLDER_CHILDREN flag even when the sub-directory is empty,
> > or only contains files that we want to ignore (those that being with a
> > period).
> 
> Patch looks reasonable, although that flag should not be being set in
> the first place really.  There's a conflict with the recursive code vs
> the non-recursive scanner.

Here's another patch which just gets rid of the conflicting code then.
The same things are still fixed.

-- dobey


Index: providers/local/camel-mbox-store.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/local/camel-mbox-store.c,v
retrieving revision 1.29
diff -u -r1.29 camel-mbox-store.c
--- providers/local/camel-mbox-store.c	19 Feb 2004 18:58:18 -0000	1.29
+++ providers/local/camel-mbox-store.c	24 Feb 2004 13:39:30 -0000
@@ -694,9 +694,7 @@
 			g_free(short_name);
 			g_free(full_name);
 			
-			if (S_ISDIR(st.st_mode)) {
-				fi->flags =(fi->flags & ~CAMEL_FOLDER_NOCHILDREN) | CAMEL_FOLDER_CHILDREN;
-			} else {
+			if (!S_ISDIR(st.st_mode)) {
 				fi->flags &= ~CAMEL_FOLDER_NOSELECT;
 				if ((ext = strchr(fi->url, ';')) && !strncmp(ext, ";noselect=yes", 13))
 					memmove(ext, ext + 13, strlen(ext + 13) + 1);