From a93ccdd7bc33bdd9622da12531689d31b594629e Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Tue, 26 Mar 2002 07:41:19 +0000 Subject: [PATCH] sync with 0.7.4cvs19 --- ChangeLog | 16 ++++++++++++++++ ChangeLog.claws | 7 ++++++- ChangeLog.jp | 16 ++++++++++++++++ configure.in | 2 +- src/folderview.c | 6 ++++-- src/gtkstext.c | 10 ++++++---- src/undo.c | 3 ++- src/utils.c | 1 - 8 files changed, 51 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83387d5aa..11d45701a 100644 --- a/ChangeLog +++ b/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 diff --git a/ChangeLog.claws b/ChangeLog.claws index ccc4fdfb9..cf9dca728 100644 --- a/ChangeLog.claws +++ b/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 - + 2002-03-25 [paul] 0.7.4claws41 diff --git a/ChangeLog.jp b/ChangeLog.jp index 93ff500af..ea8c4f418 100644 --- a/ChangeLog.jp +++ b/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 diff --git a/configure.in b/configure.in index 663b1ca72..2ca397c4f 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=claws44 +EXTRA_VERSION=claws46 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/folderview.c b/src/folderview.c index d04a4be92..b5f9d56c9 100644 --- a/src/folderview.c +++ b/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); diff --git a/src/gtkstext.c b/src/gtkstext.c index 77f3d7daf..996b41c04 100644 --- a/src/gtkstext.c +++ b/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 { diff --git a/src/undo.c b/src/undo.c index 337d9e103..dff10eb67 100644 --- a/src/undo.c +++ b/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; diff --git a/src/utils.c b/src/utils.c index f8ce27374..715d69adf 100644 --- a/src/utils.c +++ b/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; -- 2.25.1