summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-09-12 04:21:42 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-09-12 04:21:42 +0000
commit596bf1c6ad7079af82bce7656bc56f17eb1e4c91 (patch)
treeb595c8b145dba9bfc442ab0aa11d0d3cdca70dab
parent49dee1b663ffbee6a584a229ee743c4a09c9db0d (diff)
downloadgtk+-596bf1c6ad7079af82bce7656bc56f17eb1e4c91.tar.gz
Bug 551567 – DND mark broken
* gtk/gtktextbtree.c (redisplay_mark): invalidate mark properly Patch by Yevgen Muntyan. svn path=/branches/gtk-2-12/; revision=21367
-rw-r--r--ChangeLog9
-rw-r--r--gtk/gtktextbtree.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d11aa489a7..096c43090b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
Merged from trunk:
+ Bug 551567 – DND mark broken
+
+ * gtk/gtktextbtree.c (redisplay_mark): invalidate mark properly
+ Patch by Yevgen Muntyan.
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
Bug 551699 – gtk_scrolled_window_destroy() is broken
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_destroy,
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 81038f427a..798fac5f09 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -2660,6 +2660,7 @@ redisplay_mark (GtkTextLineSegment *mark)
{
GtkTextIter iter;
GtkTextIter end;
+ gboolean cursor_only;
_gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
&iter,
@@ -2669,7 +2670,8 @@ redisplay_mark (GtkTextLineSegment *mark)
gtk_text_iter_forward_char (&end);
DV (g_print ("invalidating due to moving visible mark (%s)\n", G_STRLOC));
- _gtk_text_btree_invalidate_region (mark->body.mark.tree, &iter, &end, TRUE);
+ cursor_only = mark == mark->body.mark.tree->insert_mark->segment;
+ _gtk_text_btree_invalidate_region (mark->body.mark.tree, &iter, &end, cursor_only);
}
static void