2012-10-25 [colin] 3.8.1cvs104

	* src/textview.c
	* src/textview.h
		Avoid strlen() on big buffers, use precomputed length instead
		it reduces cost of textview_write_line() from 32% to 3% for
		big messages. Patch by Igor Mammedov
	* AUTHORS
	* src/gtk/authors.h
		Add Igor

diff --git a/AUTHORS b/AUTHORS
index edffd3f8e16a73077d7d6eb53820cd6379fe5ed0..fb968b32a87289b99eb596210eb4242f8d6d2418 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -291,3 +291,4 @@ contributors (in addition to the above; based on Changelog)
        Andreas Rönnquist
        Sean Buckheister
        Natanael Copa
+       Igor Mammedov

diff --git a/ChangeLog b/ChangeLog
index f9f504ab22d66c62200996348196e59c0b69b3de..d73970e1c9b8652690983c3c71927a960f1cbaea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-25 [colin]     3.8.1cvs104
+
+       * src/textview.c
+       * src/textview.h
+               Avoid strlen() on big buffers, use precomputed length instead
+               it reduces cost of textview_write_line() from 32% to 3% for
+               big messages. Patch by Igor Mammedov
+       * AUTHORS
+       * src/gtk/authors.h
+               Add Igor
+
 2012-10-24 [mones]     3.8.1cvs103
 
        * src/advsearch.c

diff --git a/PATCHSETS b/PATCHSETS
index e06b9f8efa312d10ffa36443577fd6c4210c11ec..44f918a472a9f1883bbd6fadb7b228daef732e06 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4478,3 +4478,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 claws-mail.desktop;  ) > 3.8.1cvs101.patchset
 ( cvs diff -u -r 1.100.2.84 -r 1.100.2.85 AUTHORS;  cvs diff -u -r 1.23.2.39 -r 1.23.2.40 src/crash.c;  cvs diff -u -r 1.1.2.80 -r 1.1.2.81 src/gtk/authors.h;  ) > 3.8.1cvs102.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/advsearch.c;  ) > 3.8.1cvs103.patchset
+( cvs diff -u -r 1.100.2.85 -r 1.100.2.86 AUTHORS;  cvs diff -u -r 1.96.2.249 -r 1.96.2.250 src/textview.c;  cvs diff -u -r 1.12.2.35 -r 1.12.2.36 src/textview.h;  cvs diff -u -r 1.1.2.81 -r 1.1.2.82 src/gtk/authors.h;  ) > 3.8.1cvs104.patchset

diff --git a/configure.ac b/configure.ac
index 7381ab4422a8dc3f9be87b06a619bb42f3da1da3..1be67d332e44c7e46a2dedca56f217e923a5d879 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 5594f981629d71c64f5c05571136218df0da8d93..46753ff7f027f76c7791202e180559d8defc8a55 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -174,6 +174,7 @@ static char *CONTRIBS_LIST[] = {
 "Alessandro Maestri",
 "Maki",
 "Jindrich Makovicka",
+"Igor Mammedov",
 "Tim Mann",
 "Ivan Francolin Martinez",
 "HIRAMATSU Masami",

diff --git a/src/textview.c b/src/textview.c
index d91b3ff1f72ae8481382f92f05e508dfbe148635..8c4b6e7143adca841b9843001cf5a93581fdcbd4 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1637,6 +1637,7 @@ do_quote:
                        uri = g_new0(ClickableText, 1);
                        uri->uri = g_strdup("");
                        uri->data = g_strdup(buf);
+                       uri->data_len = strlen(uri->data);
                        uri->start = gtk_text_iter_get_offset(&iter);
                        uri->is_quote = TRUE;
                        uri->quote_level = real_quotelevel;
@@ -1669,11 +1670,12 @@ do_quote:
                                        textview->prev_quote_level = -1;
                                        goto do_quote;
                                }
-                               e_len = lasturi->data ? strlen(lasturi->data):0;
+                               e_len = lasturi->data ? lasturi->data_len:0;
                                n_len = strlen(buf);
                                lasturi->data = g_realloc((gchar *)lasturi->data, e_len + n_len + 1);
                                strcpy((gchar *)lasturi->data + e_len, buf);
                                *((gchar *)lasturi->data + e_len + n_len) = '\0';
+                               lasturi->data_len += n_len;
                        }
                }
        } else {

diff --git a/src/textview.h b/src/textview.h
index a128726fd4420ea90b85dd07127dfc6a5dbbd39d..ed36b0bea756db23ccba93bc1d64e5a23e78ccc1 100644 (file)
--- a/src/textview.h
+++ b/src/textview.h
@@ -35,6 +35,7 @@ struct _ClickableText
        gchar *filename;
 
        gpointer data;
+       gint data_len;
 
        guint start;
        guint end;