From: Colin Leroy <colin@colino.net>
Date: Sun, 22 Jan 2006 21:47:22 +0000 (+0000)
Subject: 2006-01-22 [colin]	1.9.100cvs180
X-Git-Tag: rel_2_0_0~24
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c55feb49a584dc0645af66f317f85f42dff3532b

2006-01-22 [colin]	1.9.100cvs180

	* src/compose.c
	* src/gtk/gtkaspell.c
		Don't deselect stuff before right-clicking, with aspell.
		(This prevented right-click Copy, for example).
		Thanks to Clo!
---

diff --git a/ChangeLog b/ChangeLog
index 0e0c0a1c1..8c555f569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-22 [colin]	1.9.100cvs180
+
+	* src/compose.c
+	* src/gtk/gtkaspell.c
+		Don't deselect stuff before right-clicking, with aspell.
+		(This prevented right-click Copy, for example).
+		Thanks to Clo!
+
 2006-01-22 [paul]	1.9.100cvs179
 
 	* src/summary_search.c
diff --git a/PATCHSETS b/PATCHSETS
index 4cbb6686e..bf0d1b8c9 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1163,3 +1163,4 @@
 ( cvs diff -u -r 1.42.2.18 -r 1.42.2.19 po/fr.po;  ) > 1.9.100cvs177.patchset
 ( cvs diff -u -r 1.3.2.37 -r 1.3.2.38 src/prefs_themes.c;  ) > 1.9.100cvs178.patchset
 ( cvs diff -u -r 1.15.2.21 -r 1.15.2.22 src/summary_search.c;  ) > 1.9.100cvs179.patchset
+( cvs diff -u -r 1.382.2.228 -r 1.382.2.229 src/compose.c;  cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/gtk/gtkaspell.c;  ) > 1.9.100cvs180.patchset
diff --git a/configure.ac b/configure.ac
index 95790e98e..8d87ba60f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=179
+EXTRA_VERSION=180
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index 5e521c8f2..46dca69c0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5308,6 +5308,8 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
 #if USE_ASPELL
 	if (event->button == 3) {
 		GtkTextIter iter;
+		GtkTextIter sel_start, sel_end;
+		gboolean stuff_selected;
 		gint x, y;
 		/* move the cursor to allow GtkAspell to check the word
 		 * under the mouse */
@@ -5316,7 +5318,18 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
 			&x, &y);
 		gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
 			&iter, x, y);
+		/* get selection */
+		stuff_selected = gtk_text_buffer_get_selection_bounds(
+				GTK_TEXT_VIEW(text)->buffer,
+				&sel_start, &sel_end);
+
 		gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->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,
+				&sel_start, &sel_end);
+		}
 		return FALSE; /* pass the event so that the right-click goes through */
 	}
 #endif
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 0d3d877f4..8519ffa67 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -548,15 +548,11 @@ static void button_press_intercept_cb(GtkTextView *gtktext,
 
 	if (check_at(gtkaspell, gtkaspell->orig_pos)) {
 
-		set_textview_buffer_offset(gtktext, gtkaspell->orig_pos);
-
 		if (misspelled_suggest(gtkaspell, gtkaspell->theword)) {
 			spell_menu = make_sug_menu(gtkaspell);
 			suggest = TRUE;
 		}
-	} else
-		set_textview_buffer_offset(gtktext, gtkaspell->orig_pos);
-
+	} 
 	if (!spell_menu) 
 		spell_menu = make_config_menu(gtkaspell);