fix crash when performing an action on a mime part

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7086091d0c7edcfe7ce411d99200dce7983d24c2..ede7b460b00a95360863f4a9e14a1c7993906bf8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-04-28 [paul]      0.8.11claws121
+
+       * src/action.c
+               a better fix for the crash when performing an action
+               on a mime part
+
 2003-04-28 [paul]      0.8.11claws120
 
        * src/action.c

diff --git a/configure.ac b/configure.ac
index 77f9fbb4192e7c27298d475008f207117278db52..b4d25a2217de84fe36bb4f53a866f5e3ac26b991 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws120
+EXTRA_VERSION=claws121
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/action.c b/src/action.c
index b9611fea6b33235a134722e284012e0ddfab90c0..62ee6561b0db333856d73392b363542f7da0ea43 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -588,32 +588,34 @@ static gboolean execute_actions(gchar *action, GSList *msg_list,
        }
 
        if (text) {
-               start = GTK_EDITABLE(text)->selection_start_pos;
-               end   = GTK_EDITABLE(text)->selection_end_pos;
-               if (start > end) {
-                       guint tmp;
-                       tmp = start;
-                       start = end;
-                       end = tmp;
-               }
+               if (GTK_EDITABLE(text)->has_selection) {
+                       start = GTK_EDITABLE(text)->selection_start_pos;
+                       end   = GTK_EDITABLE(text)->selection_end_pos;
+                       if (start > end) {
+                               guint tmp;
+                               tmp = start;
+                               start = end;
+                               end = tmp;
+                       }
 
-               if (start == end) {
+                       if (start == end) {
+                               start = body_pos;
+                               end = gtk_stext_get_length(GTK_STEXT(text));
+                               msg_str = gtk_editable_get_chars(GTK_EDITABLE(text),
+                                                        start, end);
+                       } else {
+                               sel_str = gtk_editable_get_chars(GTK_EDITABLE(text),
+                                                                start, end);
+                       msg_str = g_strdup(sel_str);
+                       }
+               }  else {
                        start = body_pos;
                        end = gtk_stext_get_length(GTK_STEXT(text));
                        msg_str = gtk_editable_get_chars(GTK_EDITABLE(text),
-                                                        start, end);
-               } else {
-                       sel_str = gtk_editable_get_chars(GTK_EDITABLE(text),
-                                                        start, end);
-                       msg_str = g_strdup(sel_str);
-               }
-       } else {
-               start = body_pos;
-               end = gtk_stext_get_length(GTK_STEXT(text));
-               msg_str = gtk_editable_get_chars(GTK_EDITABLE(text),
                                                 start, end);
+               } 
        }
-
+       
        if (action_type & ACTION_USER_STR) {
                if (!(user_str = get_user_string(action, ACTION_USER_STR))) {
                        g_free(msg_str);