sync with 0.7.4cvs19

ChangeLog

@@ -1,3 +1,19 @@
+2002-03-26
+
+	* src/undo.c: undo_insert_text_cb(): fixed a crash bug if the text
+	  length is large.
+	* src/gtkstext.c: gtk_stext_button_press(): cancel current selection
+	  after pasting with middle button to prevent the selection growth.
+
+2002-03-25
+
+	* src/folderview.c:
+	  folderview_rename_folder_cb()
+	  folderview_delete_folder_cb(): modify filter rules only if the
+	  target folder is in the default mailbox.
+	* src/utils.c: get_abbrev_newsgroup_name(): removed a redundant
+	  line.
+
 2002-03-23
 
 	* src/compose.c

ChangeLog.claws

@@ -1,3 +1,8 @@
+2002-03-26 [paul]	0.7.4claws46
+
+	* sync with 0.7.4cvs19
+		see ChangeLog entries 2002-03-25 and 2002-03-26
+
 2002-03-25 [hoa]	0.7.4claws45
 
 	* src/matcher.c
@@ -31,7 +36,7 @@
 	  src/quote_fmt_parse.y
 		add Last name (%L) placeholder for quoting. 
 		patch submitted by Thorsten Thielen 
-		<thth@user.sourceforge.net>
+		<thth@users.sourceforge.net>
 
 2002-03-25 [paul]	0.7.4claws41
 

ChangeLog.jp

@@ -1,3 +1,19 @@
+2002-03-26
+
+	* src/undo.c: undo_insert_text_cb(): テキストの長さが大きいときに
+	  クラッシュするバグを修正。
+	* src/gtkstext.c: gtk_stext_button_press(): セレクションが増大する
+	  のを防ぐために、中ボタンでペーストした後セレクションをキャンセル
+	  するようにした。
+
+2002-03-25
+
+	* src/folderview.c:
+	  folderview_rename_folder_cb()
+	  folderview_delete_folder_cb(): 対象フォルダがデフォルトのメール
+	  ボックス内にあるときだけ振り分けルールを修正するようにした。
+	* src/utils.c: get_abbrev_newsgroup_name(): 冗長な行を削除。
+
 2002-03-23
 
 	* src/compose.c

configure.in

@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws44
+EXTRA_VERSION=claws46
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

src/folderview.c

@@ -1889,7 +1889,8 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 
 	g_free(new_folder);
 
-	prefs_filter_rename_path(old_path, new_path);
+	if (folder_get_default_folder() == item->folder)
+		prefs_filter_rename_path(old_path, new_path);
 
 	if (FOLDER_TYPE(item->folder) == F_MH)
 		prefs_filtering_rename_path(old_path, new_path);
@@ -2004,7 +2005,8 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
 		return;
 	}
 
-	prefs_filter_delete_path(old_path);
+	if (folder_get_default_folder() == item->folder)
+		prefs_filter_delete_path(old_path);
 
 	if (FOLDER_TYPE(item->folder) == F_MH)
 		prefs_filtering_delete_path(old_path);

src/gtkstext.c

@@ -30,10 +30,6 @@
  * This modification is based on the GtkText of GTK 1.2.10
  */
 
-/* SYLPHEED:
- * comment here
- */
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
@@ -1933,6 +1929,12 @@ gtk_stext_button_press (GtkWidget      *widget,
 	  
 	  gtk_selection_convert (widget, GDK_SELECTION_PRIMARY,
 				 ctext_atom, event->time);
+
+	  /* SYLPHEED: cancel current selection after pasting */
+	  gtk_stext_set_selection (GTK_EDITABLE(text),
+				  text->cursor_mark.index,
+				  text->cursor_mark.index);
+	  editable->has_selection = FALSE;
 	}
       else
 	{

src/undo.c

@@ -524,8 +524,9 @@ void undo_insert_text_cb(GtkEditable *editable, gchar *new_text,
 	if (MB_CUR_MAX > 1) {
 		wchar_t *wstr;
 
-		Xalloca(wstr, sizeof(wchar_t) * (new_text_length + 1), return);
+		wstr = g_new(wchar_t, new_text_length + 1);
 		wlen = mbstowcs(wstr, text_to_insert, new_text_length + 1);
+		g_free(wstr);
 		if (wlen < 0) return;
 	} else
 		wlen = new_text_length;

src/utils.c

@@ -1138,7 +1138,6 @@ gchar *get_abbrev_newsgroup_name(const gchar *group)
 		if (strchr(p, '.')) {
 			*ap++ = *p++;
 			while (*p != '.') p++;
-			*ap++ = *p++;
 		} else {
 			strcpy(ap, p);
 			return abbrev_group;