From 3f8528254bb4efe66f654449d62b97210892c9ea Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 18 Apr 2006 16:41:51 +0000 Subject: [PATCH] 2006-04-18 [colin] 2.1.1cvs14 * src/textview.c Fix gdk warnings on set_cursor when textview isn't visible --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/textview.c | 17 +++++++++++------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a0f6393e..e623e2ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-18 [colin] 2.1.1cvs14 + + * src/textview.c + Fix gdk warnings on set_cursor when textview + isn't visible + 2006-04-18 [colin] 2.1.1cvs13 * src/gtk/gtksctree.c diff --git a/PATCHSETS b/PATCHSETS index 61fdd519f..bffdd01c8 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1435,3 +1435,4 @@ ( cvs diff -u -r 1.654.2.1477 -r 1.654.2.1478 configure.ac; ) > 2.1.1cvs11.patchset ( cvs diff -u -r 1.382.2.264 -r 1.382.2.265 src/compose.c; cvs diff -u -r 1.179.2.105 -r 1.179.2.106 src/imap.c; cvs diff -u -r 1.105.2.52 -r 1.105.2.53 src/prefs_account.c; cvs diff -u -r 1.49.2.18 -r 1.49.2.19 src/prefs_account.h; cvs diff -u -r 1.150.2.60 -r 1.150.2.61 src/procmsg.c; ) > 2.1.1cvs12.patchset ( cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/gtksctree.c; ) > 2.1.1cvs13.patchset +( cvs diff -u -r 1.96.2.111 -r 1.96.2.112 src/textview.c; ) > 2.1.1cvs14.patchset diff --git a/configure.ac b/configure.ac index 93b47a1d5..83e79327a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=13 +EXTRA_VERSION=14 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/textview.c b/src/textview.c index ab3a6d09e..35ca14102 100644 --- a/src/textview.c +++ b/src/textview.c @@ -1188,6 +1188,11 @@ void textview_write_link(TextView *textview, const gchar *str, textview->uri_list = g_slist_append(textview->uri_list, r_uri); } +static void textview_set_cursor(GdkWindow *window, GdkCursor *cursor) +{ + if (GDK_IS_WINDOW(window)) + gdk_window_set_cursor(window, cursor); +} void textview_clear(TextView *textview) { GtkTextView *text = GTK_TEXT_VIEW(textview->text); @@ -1209,9 +1214,9 @@ void textview_clear(TextView *textview) textview->image = NULL; if (textview->messageview->mainwin->cursor_count == 0) { - gdk_window_set_cursor(window, text_cursor); + textview_set_cursor(window, text_cursor); } else { - gdk_window_set_cursor(window, watch_cursor); + textview_set_cursor(window, watch_cursor); } } @@ -1852,7 +1857,7 @@ void textview_cursor_wait(TextView *textview) GdkWindow *window = gtk_text_view_get_window( GTK_TEXT_VIEW(textview->text), GTK_TEXT_WINDOW_TEXT); - gdk_window_set_cursor(window, watch_cursor); + textview_set_cursor(window, watch_cursor); } void textview_cursor_normal(TextView *textview) @@ -1860,7 +1865,7 @@ void textview_cursor_normal(TextView *textview) GdkWindow *window = gtk_text_view_get_window( GTK_TEXT_VIEW(textview->text), GTK_TEXT_WINDOW_TEXT); - gdk_window_set_cursor(window, text_cursor); + textview_set_cursor(window, text_cursor); } static void textview_uri_update(TextView *textview, gint x, gint y) @@ -1922,9 +1927,9 @@ static void textview_uri_update(TextView *textview, gint x, gint y) window = gtk_text_view_get_window(GTK_TEXT_VIEW(textview->text), GTK_TEXT_WINDOW_TEXT); if (textview->messageview->mainwin->cursor_count == 0) { - gdk_window_set_cursor(window, uri ? hand_cursor : text_cursor); + textview_set_cursor(window, uri ? hand_cursor : text_cursor); } else { - gdk_window_set_cursor(window, watch_cursor); + textview_set_cursor(window, watch_cursor); } TEXTVIEW_STATUSBAR_POP(textview); -- 2.25.1