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

2008-01-15 [colin] 3.2.0cvs45

Browse source 
* src/compose.c
		Fix bug 1472, 'Keyboard "Menu" key doesn't call
		spell check of actuall word'
	* src/summaryview.c
		Temporarily disable immediate execution when learning
		spam *only* if the summaryview isn't locked
This commit is contained in:
Colin Leroy 2008-01-15 17:47:52 +00:00
parent c4bd1a3349
commit c387ed2a67
5 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-01-15 [colin] 3.2.0cvs45
* src/compose.c
Fix bug 1472, 'Keyboard "Menu" key doesn't call
spell check of actuall word'
* src/summaryview.c
Temporarily disable immediate execution when learning
spam *only* if the summaryview isn't locked
2008-01-15 [wwp] 3.2.0cvs44
* src/prefs_filtering.c

1
PATCHSETS
View file

@ -3181,3 +3181,4 @@
( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/common/passcrypt.c; ) > 3.2.0cvs42.patchset
( cvs diff -u -r 1.382.2.429 -r 1.382.2.430 src/compose.c; ) > 3.2.0cvs43.patchset
( cvs diff -u -r 1.59.2.63 -r 1.59.2.64 src/prefs_filtering.c; ) > 3.2.0cvs44.patchset
( cvs diff -u -r 1.382.2.430 -r 1.382.2.431 src/compose.c; cvs diff -u -r 1.395.2.350 -r 1.395.2.351 src/summaryview.c; ) > 3.2.0cvs45.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=2
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=44
EXTRA_VERSION=45
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

25
src/compose.c
View file

@ -6391,7 +6391,7 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
Compose *compose)
{
gint prev_autowrap;
GtkTextBuffer *buffer;
GtkTextBuffer *buffer = GTK_TEXT_VIEW(text)->buffer;
#if USE_ASPELL
if (event->button == 3) {
GtkTextIter iter;
@ -6400,21 +6400,26 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
gint x, y;
/* move the cursor to allow GtkAspell to check the word
* under the mouse */
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
GTK_TEXT_WINDOW_TEXT, event->x, event->y,
&x, &y);
gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
&iter, x, y);
if (event->x && event->y) {
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
GTK_TEXT_WINDOW_TEXT, event->x, event->y,
&x, &y);
gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
&iter, x, y);
} else {
GtkTextMark *mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
}
/* get selection */
stuff_selected = gtk_text_buffer_get_selection_bounds(
GTK_TEXT_VIEW(text)->buffer,
buffer,
&sel_start, &sel_end);
gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
gtk_text_buffer_place_cursor (buffer, &iter);
/* reselect stuff */
if (stuff_selected
&& gtk_text_iter_in_range(&iter, &sel_start, &sel_end)) {
gtk_text_buffer_select_range(GTK_TEXT_VIEW(text)->buffer,
gtk_text_buffer_select_range(buffer,
&sel_start, &sel_end);
}
return FALSE; /* pass the event so that the right-click goes through */
@ -6490,6 +6495,8 @@ static gboolean compose_popup_menu(GtkWidget *widget, gpointer data)
event.button = 3;
event.time = gtk_get_current_event_time();
event.x = 0;
event.y = 0;
return text_clicked(compose->text, &event, compose);
}

3
src/summaryview.c
View file

@ -3849,10 +3849,11 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
gboolean moved = FALSE;
gboolean froze = FALSE;
prefs_common.immediate_exec = FALSE;
if (summary_is_locked(summaryview))
return;
prefs_common.immediate_exec = FALSE;
START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);