gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2005-10-30 [colin] 1.9.15cvs127

Browse source 
* src/compose.c
		Place cursor before rewrapping (fixes cursor
		pos if quotation gets rewrapped)
This commit is contained in:
Colin Leroy 2005-10-30 18:25:01 +00:00
parent 4362fa9304
commit 759aa3ce13
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog-gtk2.claws
View file

@ -1,3 +1,9 @@
2005-10-30 [colin] 1.9.15cvs127
* src/compose.c
Place cursor before rewrapping (fixes cursor
pos if quotation gets rewrapped)
2005-10-29 [paul] 1.9.15cvs126
* src/crash.c

1
PATCHSETS
View file

@ -963,3 +963,4 @@
( cvs diff -u -r 1.395.2.144 -r 1.395.2.145 src/summaryview.c; ) > 1.9.15cvs124.patchset
( cvs diff -u -r 1.94.2.67 -r 1.94.2.68 src/messageview.c; ) > 1.9.15cvs125.patchset
( cvs diff -u -r 1.23.2.15 -r 1.23.2.16 src/crash.c; cvs diff -u -r 1.26.2.20 -r 1.26.2.21 src/foldersel.c; cvs diff -u -r 1.115.2.64 -r 1.115.2.65 src/main.c; cvs diff -u -r 1.94.2.68 -r 1.94.2.69 src/messageview.c; cvs diff -u -r 1.43.2.32 -r 1.43.2.33 src/toolbar.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/authors.h; ) > 1.9.15cvs126.patchset
( cvs diff -u -r 1.382.2.190 -r 1.382.2.191 src/compose.c; ) > 1.9.15cvs127.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=126
EXTRA_VERSION=127
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

17
src/compose.c
View file

@ -1125,8 +1125,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
PrefsAccount *reply_account;
GtkTextView *textview;
GtkTextBuffer *textbuf;
GtkTextIter iter;
int cursor_pos;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
@ -1210,11 +1208,6 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
cursor_pos = quote_fmt_get_cursor_pos();
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
gtk_text_buffer_place_cursor(textbuf, &iter);
compose_wrap_all(compose);
gtk_widget_grab_focus(compose->text);
@ -2105,8 +2098,10 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
gint len;
gboolean prev_autowrap;
const gchar *trimmed_body = body;
gint cursor_pos = 0;
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextIter iter;
if (!msginfo)
msginfo = &dummyinfo;
@ -2151,8 +2146,6 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
compose);
for (p = buf; *p != '\0'; ) {
GtkTextMark *mark;
GtkTextIter iter;
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
@ -2180,6 +2173,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
break;
}
cursor_pos = quote_fmt_get_cursor_pos();
gtk_text_buffer_get_start_iter(buffer, &iter);
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
gtk_text_buffer_place_cursor(buffer, &iter);
compose->autowrap = prev_autowrap;
if (compose->autowrap)
compose_wrap_all(compose);