From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 23 Apr 2002 07:23:52 +0000 (+0000)
Subject: sync with 0.7.5cvs3
X-Git-Tag: rel_0_7_5~14
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8c769be37887d143aa2946663ccf18e152b2835b;hp=046cdade9fcde937884ac3fd1954df8a21e8d46d;ds=sidebyside

sync with 0.7.5cvs3
---

diff --git a/ChangeLog b/ChangeLog
index e9f4c408f..742f0da45 100644
--- 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 e198f536b..200edcf2a 100644
--- 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 744488ca1..a2b8ffd8a 100644
--- 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 3f70d5546..eb3431887 100644
--- 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 839e4e767..5df6dbf9c 100644
--- 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 2d94ba63b..35fd86c83 100644
--- 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 568b8895e..8ae35104c 100644
--- 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)