fix select_all and copy in multipart messages

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8f3ee7f314eccbf9b3c890a245ae3cb122092958..a781abb439f8509d02b5cf7878f09d3025b2c96a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-05-13 [thorsten]  0.7.5claws25
+
+       * src/messageview.c
+               fix select_all and copy in multipart messages
+       * src/mainwindow.c
+               fix select_all and copy in multipart messages
+
 2002-05-12 [paul]      0.7.5claws24
 
        * src/summaryview.c

diff --git a/configure.in b/configure.in
index a8fb71eab622df5b9c90dcf2b891df34f736fe83..17f02b44b170a91e34f2b55ec8622f1972fdca3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws24
+EXTRA_VERSION=claws25
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a5e5747466bc2776009511f4aef6cb21f7c001c4..902771e5aa0515ec87b8921804f9815ad0dbfa04 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3002,8 +3002,11 @@ static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
                summary_select_all(mainwin->summaryview);
-       else if (mainwin->summaryview->msg_is_toggled_on &&
-                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text))
+       else if (mainwin->summaryview->msg_is_toggled_on && (
+                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text) ||
+                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->ctree) ||
+                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->notebook) ||
+                GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->textview->text)))
                messageview_select_all(mainwin->messageview);
 }
 

diff --git a/src/messageview.c b/src/messageview.c
index 4c5e5f6e1d28b797987e8fe7d01d1798e45cfe57..68f2515b6cf22cf0264cc4ae192397fe2c69bcc9 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -506,7 +506,14 @@ void messageview_set_font(MessageView *messageview)
 
 void messageview_copy_clipboard(MessageView *messageview)
 {
-       switch (messageview->type) {
+       gint displaytype = /* force MVIEV_TEXT on first page */
+               ((messageview->type == MVIEW_MIME)
+               && (gtk_notebook_get_current_page(GTK_NOTEBOOK(
+                               messageview->mimeview->notebook)) > 0))
+               ? MVIEW_MIME
+               : MVIEW_TEXT;
+
+       switch (displaytype) {
        case MVIEW_TEXT:
                gtk_editable_copy_clipboard(GTK_EDITABLE(messageview->textview->text));
                break;
@@ -520,7 +527,14 @@ void messageview_copy_clipboard(MessageView *messageview)
 
 void messageview_select_all(MessageView *messageview)
 {
-       switch (messageview->type) {
+       gint displaytype = /* force MVIEV_TEXT on first page */
+               ((messageview->type == MVIEW_MIME)
+               && (gtk_notebook_get_current_page(GTK_NOTEBOOK(
+                               messageview->mimeview->notebook)) > 0))
+               ? MVIEW_MIME
+               : MVIEW_TEXT;
+
+       switch (displaytype) {
        case MVIEW_TEXT:
                gtk_editable_select_region(GTK_EDITABLE(messageview->textview->text), 0, -1);
                break;