sync with sylpheed 0.6.5cvs23

diff --git a/ChangeLog b/ChangeLog
index 386c7f4..4551ae0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-08
+
+       * src/messageview.c: messageview_change_view_type(): disclaim the
+         selection before removing textview. This solves the mysterious
+         copy-paste disability (thanks to Melvin Hadasht).
+       * src/textview.c: textview_set_font(): use
+         gtk_editable_claim_selection() instead of
+         gtk_editable_select_region().
+
 2001-12-06
 
        * src/prefs_template.c: prefs_template_window_create(): supported

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7f0854c..e7c4ac1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-08 [paul]      0.6.5claws62
+
+       * sync with sylpheed 0.6.5cvs23
+               see ChangeLog entry 2001-12-08
+
 2001-12-07 [christoph] 0.6.5claws61
 
        * src/compose.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index c28657a..32a3647 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,11 @@
+2001-12-08
+
+       * src/messageview.c: messageview_change_view_type(): textview ¤ò
+         ³°¤¹Á°¤Ë¥»¥ì¥¯¥·¥ç¥ó¤òÊü´þ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£¤³¤ì¤ÇÆæ¤Î¥³¥Ô¡¼¡¦
+         ¥Ú¡¼¥¹¥È¤Î¾ã³²¤¬²ò·è(Melvin Hadasht ¤µ¤ó thanks)¡£
+       * src/textview.c: textview_set_font(): gtk_editable_select_region()
+         ¤ÎÂå¤ï¤ê¤Ë gtk_editable_claim_selection() ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2001-12-06
 
        * src/prefs_template.c: prefs_template_window_create(): To:

diff --git a/configure.in b/configure.in
index be9e088..eb38a25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws61
+EXTRA_VERSION=claws62
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/messageview.c b/src/messageview.c
index 827a207..056c753 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -472,8 +472,8 @@ static void messageview_change_view_type(MessageView *messageview,
        if (messageview->type == type) return;
 
        if (type == MVIEW_MIME) {
-               if (textview->text) 
-                       gtk_editable_claim_selection(GTK_EDITABLE(textview->text), FALSE, GDK_CURRENT_TIME);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove
                        (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
                         GTK_WIDGET_PTR(textview));
@@ -483,8 +483,8 @@ static void messageview_change_view_type(MessageView *messageview,
                                  GTK_WIDGET_PTR(textview));
                mimeview->type = MIMEVIEW_TEXT;
        } else if (type == MVIEW_TEXT) {
-               if (mimeview->textview->text) 
-                       gtk_editable_claim_selection(GTK_EDITABLE(mimeview->textview->text), FALSE, GDK_CURRENT_TIME);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove
                        (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
                         GTK_WIDGET_PTR(mimeview));

diff --git a/src/textview.c b/src/textview.c
index 70e878a..d6d12e3 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -948,8 +948,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_mb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_mb), 0, 0);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text_mb),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove(GTK_CONTAINER(parent),
                                     textview->scrolledwin_mb);
                gtk_container_add(GTK_CONTAINER(parent),
@@ -961,8 +961,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_sb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_sb), 0, 0);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text_sb),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove(GTK_CONTAINER(parent),
                                     textview->scrolledwin_sb);
                gtk_container_add(GTK_CONTAINER(parent),