[evolution-patches] fix for busted 'save vfolder as search' operation

[Not Zed <notzed ximian com>]

changelog says it all

Index: widgets/misc/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.366
diff -u -p -r1.366 ChangeLog
--- widgets/misc/ChangeLog	29 Jul 2005 06:48:20 -0000	1.366
+++ widgets/misc/ChangeLog	3 Aug 2005 10:25:59 -0000
@@ -1,3 +1,8 @@
+2005-08-03  Not Zed  <NotZed Ximian com>
+
+	* e-filter-bar.c (build_items): revert dobey's last patch here, it
+	completely broke customisation of the menu.
+
 2005-07-29  Srinivasa Ragavan <sragavan novell com>
 
 	* e-attachment.c: (e_attachment_new_from_mime_part) used ref instead of 
Index: widgets/misc/e-filter-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
retrieving revision 1.51
diff -u -p -r1.51 e-filter-bar.c
--- widgets/misc/e-filter-bar.c	13 May 2005 21:29:28 -0000	1.51
+++ widgets/misc/e-filter-bar.c	3 Aug 2005 10:25:59 -0000
@@ -334,6 +334,17 @@ build_items (ESearchBar *esb, ESearchBar
 
 	g_ptr_array_set_size(rules, 0);
 
+	/* find a unique starting point for the id's of our items */
+	for (i = 0; items[i].id != -1; i++) {
+		ESearchBarItem dup_item;
+
+		if (items[i].id >= id)
+			id = items[i].id + 1;
+
+		dup_item_no_subitems (&dup_item, items + i);
+		g_array_append_vals (menu, &dup_item, 1);
+	}
+	
 	*start = id;
 	
 	if (type == 0) {
@@ -373,17 +384,6 @@ build_items (ESearchBar *esb, ESearchBar
 		g_ptr_array_add (rules, rule);
 	}
 
-	/* find a unique starting point for the id's of our items */
-	for (i = 0; items[i].id != -1; i++) {
-		ESearchBarItem dup_item;
-
-		if (items[i].id >= id)
-			id = items[i].id + 1;
-
-		dup_item_no_subitems (&dup_item, items + i);
-		g_array_append_vals (menu, &dup_item, 1);
-	}
-	
 	/* anything elft in gtksux has gone away, and we need to unref/disconnect from it */
 	while (gtksux) {
 		GSList *next;