CVS: sylpheedclaws/sylpheed-claws/src folder.c,1.213.2.125,1.213.2.126 html.c,1.12.2.15,1.12.2.16

[email protected] Thu, 21 Dec 2006 07:58:11 +0000
Newsgroups gmane.mail.sylpheed.claws.cvs
Message-ID <[email protected]>
Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv29064/src

Modified Files:
      Tag: gtk2
	folder.c html.c 
Log Message:
2006-12-21 [colin]	2.6.1cvs60

	* src/folder.c
		Look for folders by path in all folders
	* src/html.c
		add &mdash;

Index: folder.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/folder.c,v
retrieving revision 1.213.2.125
retrieving revision 1.213.2.126
diff -u -d -r1.213.2.125 -r1.213.2.126
--- folder.c	2006/11/07 10:38:50	1.213.2.125
+++ folder.c	2006/12/21 07:58:06	1.213.2.126
@@ -1142,14 +1142,20 @@
 {
 	Folder *folder;
 	gpointer d[2];
-
-	folder = folder_get_default_folder();
+	GList *list = folder_get_list();
+	
+	folder = list ? list->data:NULL;
+	
 	g_return_val_if_fail(folder != NULL, NULL);
 
 	d[0] = (gpointer)path;
 	d[1] = NULL;
-	g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+	while (d[1] == NULL && list) {
+		folder = FOLDER(list->data);
+		g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
 			folder_item_find_func, d);
+		list = list->next;
+	}
 	return d[1];
 }
 

Index: html.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/html.c,v
retrieving revision 1.12.2.15
retrieving revision 1.12.2.16
diff -u -d -r1.12.2.15 -r1.12.2.16
--- html.c	2006/11/07 10:38:54	1.12.2.15
+++ html.c	2006/12/21 07:58:06	1.12.2.16
@@ -50,6 +50,7 @@
 	{"&trade;" , "(TM)"},
 	{"&#153;", "(TM)"},
 	{"&hellip;", "..."},
+	{"&mdash;", "-"},
 };
 
 static SC_HTMLSymbol ascii_symbol_list[] = {