[evolution-patches] 69579

[Not Zed <notzed ximian com>]

fixes some bug i couldn't care less about

--

Michael Zucchi <notzed ximian com> "Free Software, putting the Free back in Free Market." Novell's Evolution and Free Software Developer

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.26
diff -u -p -r1.3444.2.26 ChangeLog
--- mail/ChangeLog	19 Nov 2004 00:45:55 -0000	1.3444.2.26
+++ mail/ChangeLog	23 Nov 2004 04:14:59 -0000
@@ -1,3 +1,26 @@
+2004-11-23  Not Zed  <NotZed Ximian com>
+
+	** See bug #69579.
+
+	* em-folder-properties.c (em_folder_properties_show): check to see
+	if the vfolder is the unmatched folder before letting the user try
+	to see its properties.
+
+2004-11-22  Not Zed  <NotZed Ximian com>
+
+	** See bug #69339.
+
+	* em-format-html.c (efh_format_do): after closing the base output
+	stream, re-loop if more jobs were queued.
+
+2004-11-19  Not Zed  <NotZed Ximian com>
+
+	** See bug #69339.
+
+	* em-format-html.c (efh_format_do): close the stream/html after we're
+	finished, since the multipart/related stuff may write more content
+	for orphaned attachments.
+
 2004-11-10  Not Zed  <NotZed Ximian com>
 
 	** See bug #68794.
Index: mail/em-folder-properties.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-properties.c,v
retrieving revision 1.3
diff -u -p -r1.3 em-folder-properties.c
--- mail/em-folder-properties.c	16 Jun 2004 21:41:52 -0000	1.3
+++ mail/em-folder-properties.c	23 Nov 2004 04:15:00 -0000
@@ -39,6 +39,7 @@
 #include <gtk/gtkvbox.h>
 
 #include <camel/camel-folder.h>
+#include <camel/camel-vee-folder.h>
 
 #include "em-folder-properties.h"
 
@@ -274,9 +275,23 @@ void
 em_folder_properties_show(GtkWindow *parent, CamelFolder *folder, const char *uri)
 {
 	/* HACK: its the old behaviour, not very 'neat' but it works */
-	if (!strncmp(uri, "vfolder:", 8))
-		vfolder_edit_rule(uri);
-	else if (folder == NULL)
+	if (!strncmp(uri, "vfolder:", 8)) {
+		CamelURL *url = camel_url_new(uri, NULL);
+
+		/* MORE HACK: UNMATCHED is a special folder which you can't modify, so check for it here */
+		if (url == NULL
+		    || url->fragment == NULL
+		    || strcmp(url->fragment, CAMEL_UNMATCHED_NAME) != 0) {
+			if (url)
+				camel_url_free(url);
+			vfolder_edit_rule(uri);
+			return;
+		}
+		if (url)
+			camel_url_free(url);
+	}
+
+	if (folder == NULL)
 		mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new);
 	else
 		emfp_dialog_got_folder((char *)uri, folder, NULL);