[Commits] [SCM] claws branch, master, updated. 3.15.0-7-g7cdd093

[ticho at claws-mail.org]

The branch, master has been updated
       via  7cdd09339e2d355d5f67ec26de1b4a2a7331ddfb (commit)
       via  531de2f6b82f2519638483066c7b1f4f5a96151d (commit)
      from  1acb353987cb2a45b6b6802cc48db6f66aac3121 (commit)

Summary of changes:
 src/textview.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 7cdd09339e2d355d5f67ec26de1b4a2a7331ddfb
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Mar 30 01:56:48 2017 +0200

    Revert "Fix an off-by-one error in textview's quote unfolding."
    
    This reverts commit 8819febec59e3d5421b0cd4d7882d6524c375bcf.
    I refuse to be driven to madness by our textview's colorization.

diff --git a/src/textview.c b/src/textview.c
index 1ecaebc..7372a1c 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2706,7 +2706,7 @@ static void textview_toggle_quote(TextView *textview, GSList *start_list, Clicka
 		gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
 		gtk_text_buffer_insert_with_tags_by_name
 				(buffer, &start, (gchar *)uri->data, 
-				 uri->data_len,
+				 strlen((gchar *)uri->data)-1,
 				 "qlink", (gchar *)uri->fg_color, NULL);
 		uri->end = gtk_text_iter_get_offset(&start);
 		textview_make_clickable_parts_later(textview,

commit 531de2f6b82f2519638483066c7b1f4f5a96151d
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Mar 30 01:55:59 2017 +0200

    Revert "Fix the other off-by-one bug in textview quoting."
    
    This reverts commit 1acb353987cb2a45b6b6802cc48db6f66aac3121.
    I refuse to be driven to madness by our textview's colorization.

diff --git a/src/textview.c b/src/textview.c
index 3b4ff2b..1ecaebc 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1664,7 +1664,7 @@ do_quote:
 					(buffer, &iter, " [...]", -1,
 					 "qlink", fg_color, NULL);
 			uri->end = gtk_text_iter_get_offset(&iter);
-			gtk_text_buffer_insert(buffer, &iter, "\n", -1);
+			gtk_text_buffer_insert(buffer, &iter, "  \n", -1);
 			
 			uri->filename = NULL;
 			textview->uri_list =
@@ -2701,7 +2701,7 @@ static void textview_toggle_quote(TextView *textview, GSList *start_list, Clicka
 		gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
 		gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
 		textview_shift_uris_after(textview, start_list, uri->start, 
-			g_utf8_strlen((gchar *)uri->data, -1)-strlen(" [...]"));
+			g_utf8_strlen((gchar *)uri->data, -1)-strlen(" [...]\n"));
 		gtk_text_buffer_delete(buffer, &start, &end);
 		gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
 		gtk_text_buffer_insert_with_tags_by_name
@@ -2717,7 +2717,7 @@ static void textview_toggle_quote(TextView *textview, GSList *start_list, Clicka
 		gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
 		textview_remove_uris_in(textview, uri->start, uri->end);
 		textview_shift_uris_after(textview, start_list, uri->start, 
-			strlen(" [...]")-g_utf8_strlen((gchar *)uri->data, -1));
+			strlen(" [...]\n")-g_utf8_strlen((gchar *)uri->data, -1));
 		gtk_text_buffer_delete(buffer, &start, &end);
 		gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
 		gtk_text_buffer_insert_with_tags_by_name

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail