2006-12-21 [colin] 2.6.1cvs60

	* src/folder.c
		Look for folders by path in all folders
	* src/html.c
		add —

diff --git a/ChangeLog b/ChangeLog
index d5d98b65445680176bc28f8f95299f2fa1ff5801..97645fcbdfefa276604ace0f5240519e0f934009 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-21 [colin]     2.6.1cvs60
+
+       * src/folder.c
+               Look for folders by path in all folders
+       * src/html.c
+               add —
+
 2006-12-20 [colin]     2.6.1cvs59
 
        * src/gtk/quicksearch.c

diff --git a/PATCHSETS b/PATCHSETS
index a44a49d04212d40db9bec415fe991eb76726f40d..2af8e0102a03f2b44cadb67ede0f671c329ce875 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2167,3 +2167,4 @@
 ( cvs diff -u -r 1.204.2.112 -r 1.204.2.113 src/prefs_common.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_summaries.c;  ) > 2.6.1cvs57.patchset
 ( cvs diff -u -r 1.654.2.2219 -r 1.654.2.2220 configure.ac;  ) > 2.6.1cvs58.patchset
 ( cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/gtk/quicksearch.c;  ) > 2.6.1cvs59.patchset
+( cvs diff -u -r 1.213.2.125 -r 1.213.2.126 src/folder.c;  cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/html.c;  ) > 2.6.1cvs60.patchset

diff --git a/configure.ac b/configure.ac
index 0808e644dddbbc25dbe4a0fbd98aebcb26f8e14c..d9c273f4c59d6042d6b8209683e5c37d15dffb1d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 3a990e4e83202b057544a4dcbe09d2424333cb41..32f72d48f66d91d1eaaa082fc52afa52cff8f783 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1142,14 +1142,20 @@ FolderItem *folder_find_item_from_path(const gchar *path)
 {
        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];
 }
 

diff --git a/src/html.c b/src/html.c
index 4551c7a2d03e88789d32e4b76c874b7e6702ba00..2d8042cdbbdc6062497f320af97dc449a8793b65 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -50,6 +50,7 @@ static SC_HTMLSymbol symbol_list[] = {
        {"™" , "(TM)"},
        {"™", "(TM)"},
        {"…", "..."},
+       {"—", "-"},
 };
 
 static SC_HTMLSymbol ascii_symbol_list[] = {