sync with 0.7.5cvs3

diff --git a/ChangeLog b/ChangeLog
index e9f4c408f05a12a5ff25b684b6c205cb00705f05..742f0da45be3f24322a6a84373320363b69f6dd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-23
+
+       * src/imap.c: imap_create_folder(): don't add prefix for root INBOX
+         folder.
+       * src/folderview.c: folderview_select()
+         src/summary_search.c: summary_search_execute(): lock summary view
+         while searching (thanks to Martin Schaaf).
+
 2002-04-21
 
        * version 0.7.5

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e198f536b015446b9445f12c4a46460371cd0512..200edcf2a52ed763f9ca7c1e39b7361da33f3510 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-23 [paul]      0.7.4claws94
+
+       * sync with 0.7.5cvs3
+               bug fixes: see ChangeLog entry 2002-04-23
+
 2002-04-22 [darko]     0.7.4claws93
 
        * src/compose.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 744488ca17a5408a0bb1d94ed6cf6ae6b06436a5..a2b8ffd8a560688b4547d3ee1d55541b9ce5bc3b 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2002-04-23
+
+       * src/imap.c: imap_create_folder(): root ¤Î INBOX ¥Õ¥©¥ë¥À¤Ë¥×¥ì
+         ¥Õ¥£¥¯¥¹¤òÉÕ¤±¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/folderview.c: folderview_select()
+         src/summary_search.c: summary_search_execute(): ¸¡º÷Ãæ¤Ë¥µ¥Þ¥ê
+         ¥Ó¥å¡¼¤ò¥í¥Ã¥¯¤¹¤ë¤è¤¦¤Ë¤·¤¿(Martin Schaaf ¤µ¤ó thanks)¡£
+
 2002-04-21
 
        * version 0.7.5

diff --git a/configure.in b/configure.in
index 3f70d55462b06be736a61f5134b0607d35b4302b..eb3431887f1c0b7b7055c82e05cd5e49fa562e42 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws93
+EXTRA_VERSION=claws94
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folderview.c b/src/folderview.c
index 839e4e767b021571537f782dd385c140d3de6d60..5df6dbf9cba333e92f8f7c47723c28a02f3c7eff 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1586,7 +1586,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
 
-       if (!can_select) {
+       if (!can_select || summary_is_locked(folderview->summaryview)) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
                return;

diff --git a/src/imap.c b/src/imap.c
index 2d94ba63b982b2951bfcdd0699451767761d6e71..35fd86c83d61eda34ffc3e4537b0501b37a06ae1 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1259,7 +1259,9 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        session = imap_session_get(folder);
        if (!session) return NULL;
 
-       if (parent->path)
+       if (!parent->parent && strcmp(name, "INBOX") == 0)
+               dirpath = g_strdup(name);
+       else if (parent->path)
                dirpath = g_strconcat(parent->path, "/", name, NULL);
        else if ((p = strchr(name, '/')) != NULL && *(p + 1) != '\0')
                dirpath = g_strdup(name);

diff --git a/src/summary_search.c b/src/summary_search.c
index 568b8895eb8b185e87db406fa43015d5be84d3d3..8ae35104ca1ec3b35698c37443595910e1931499 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -232,6 +232,9 @@ static void summary_search_execute(GtkButton *button, gpointer data)
        wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
                                  const wchar_t *needle);
 
+       if (summary_is_locked(summaryview)) return;
+       summary_lock(summaryview);
+
        case_sens = gtk_toggle_button_get_active
                (GTK_TOGGLE_BUTTON(case_checkbtn));
        backward = gtk_toggle_button_get_active
@@ -267,7 +270,10 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                else
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-               if (!node) return;
+               if (!node) {
+                       summary_unlock(summaryview);
+                       return;
+               }
        } else {
                if (backward)
                        node = GTK_CTREE_NODE_PREV(summaryview->selected);
@@ -370,6 +376,8 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 
        if (*body_str)
                main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
 }
 
 static void summary_search_clear(GtkButton *button, gpointer data)