From 1320ac05875acf93ff755b4c71acd9bf80eb7c37 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 3 Oct 2009 19:27:40 +0000 Subject: [PATCH] 2009-10-03 [colin] 3.7.2cvs42 * src/mimeview.c * src/noticeview.c * src/gtk/gtkcmclist.c * src/gtk/gtkvscrollbutton.c * src/gtk/logwindow.c GTK+ 2.18 fixes: Fix bug 2008, 'Claws-Mail doesn't refresh after deletion' Fix bug 2009, 'Incorrect pointer representation with GTK+2.18' Fix warning at start --- ChangeLog | 12 ++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkcmclist.c | 11 ++++++++--- src/gtk/gtkvscrollbutton.c | 4 ---- src/gtk/logwindow.c | 2 -- src/mimeview.c | 4 ---- src/noticeview.c | 2 -- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c03f1586..6577579a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-10-03 [colin] 3.7.2cvs42 + + * src/mimeview.c + * src/noticeview.c + * src/gtk/gtkcmclist.c + * src/gtk/gtkvscrollbutton.c + * src/gtk/logwindow.c + GTK+ 2.18 fixes: + Fix bug 2008, 'Claws-Mail doesn't refresh after deletion' + Fix bug 2009, 'Incorrect pointer representation with GTK+2.18' + Fix warning at start + 2009-09-28 [colin] 3.7.2cvs41 * src/matcher.c diff --git a/PATCHSETS b/PATCHSETS index 7e451686d..b6be547ac 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3866,3 +3866,4 @@ ( cvs diff -u -r 1.654.2.3932 -r 1.654.2.3933 configure.ac; ) > 3.7.2cvs39.patchset ( cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/prefs_summaries.c; cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/gtk/sslcertwindow.c; ) > 3.7.2cvs40.patchset ( cvs diff -u -r 1.75.2.66 -r 1.75.2.67 src/matcher.c; cvs diff -u -r 1.83.2.155 -r 1.83.2.156 src/mimeview.c; cvs diff -u -r 1.52.2.77 -r 1.52.2.78 src/prefs_folder_item.c; ) > 3.7.2cvs41.patchset +( cvs diff -u -r 1.83.2.156 -r 1.83.2.157 src/mimeview.c; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/noticeview.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/gtkcmclist.c; cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.4.35 -r 1.1.4.36 src/gtk/logwindow.c; ) > 3.7.2cvs42.patchset diff --git a/configure.ac b/configure.ac index acf526113..18fc6cc3d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=41 +EXTRA_VERSION=42 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c index f4f1f6889..11e10a0d0 100644 --- a/src/gtk/gtkcmclist.c +++ b/src/gtk/gtkcmclist.c @@ -6001,9 +6001,14 @@ draw_rows (GtkCMCList *clist, i++; } - if (!area) - gdk_window_clear_area (clist->clist_window, 0, - ROW_TOP_YPIXEL (clist, i), 0, 0); + if (!area) { + int w, h, y; + gdk_drawable_get_size (GDK_DRAWABLE (clist->clist_window), &w, &h); + y = ROW_TOP_YPIXEL (clist, i); + gdk_window_clear_area (clist->clist_window, + 0, y, + w, h - y); + } } static void diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c index d519a972e..33e49df19 100644 --- a/src/gtk/gtkvscrollbutton.c +++ b/src/gtk/gtkvscrollbutton.c @@ -161,16 +161,12 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton) gtk_widget_show(scrollbutton->downbutton); gtk_widget_show(scrollbutton->upbutton); - g_signal_connect(G_OBJECT(scrollbutton->upbutton), "visibility-notify-event", - G_CALLBACK(vscroll_visi_notify), NULL); g_signal_connect(G_OBJECT(scrollbutton->upbutton), "motion-notify-event", G_CALLBACK(vscroll_visi_notify), NULL); g_signal_connect(G_OBJECT(scrollbutton->upbutton), "leave-notify-event", G_CALLBACK(vscroll_leave_notify), NULL); g_signal_connect(G_OBJECT(scrollbutton->upbutton), "enter-notify-event", G_CALLBACK(vscroll_enter_notify), NULL); - g_signal_connect(G_OBJECT(scrollbutton->downbutton), "visibility-notify-event", - G_CALLBACK(vscroll_visi_notify), NULL); g_signal_connect(G_OBJECT(scrollbutton->downbutton), "motion-notify-event", G_CALLBACK(vscroll_visi_notify), NULL); g_signal_connect(G_OBJECT(scrollbutton->downbutton), "leave-notify-event", diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c index ab254724e..b0452456d 100644 --- a/src/gtk/logwindow.c +++ b/src/gtk/logwindow.c @@ -147,8 +147,6 @@ LogWindow *log_window_create(LogInstance instance) logwin->text = text; logwin->hook_id = hooks_register_hook(get_log_hook(instance), log_window_append, logwin); - gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(text), logwin->end_mark); - return logwin; } diff --git a/src/mimeview.c b/src/mimeview.c index 6ab97459e..de500fb7a 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -321,8 +321,6 @@ MimeView *mimeview_create(MainWindow *mainwin) mime_toggle = gtk_event_box_new(); gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE); - g_signal_connect(G_OBJECT(mime_toggle), "visibility-notify-event", - G_CALLBACK(mimeview_visi_notify), mimeview); g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event", G_CALLBACK(mimeview_visi_notify), mimeview); g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event", @@ -2219,8 +2217,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo) mimeview->icon_count++; button = gtk_event_box_new(); - g_signal_connect(G_OBJECT(button), "visibility-notify-event", - G_CALLBACK(mimeview_visi_notify), mimeview); g_signal_connect(G_OBJECT(button), "motion-notify-event", G_CALLBACK(mimeview_visi_notify), mimeview); g_signal_connect(G_OBJECT(button), "leave-notify-event", diff --git a/src/noticeview.c b/src/noticeview.c index 8aa726c33..907bdc67e 100644 --- a/src/noticeview.c +++ b/src/noticeview.c @@ -97,8 +97,6 @@ NoticeView *noticeview_create(MainWindow *mainwin) g_signal_connect(G_OBJECT(evtbox), "button-press-event", G_CALLBACK(noticeview_icon_pressed), (gpointer) noticeview); - g_signal_connect(G_OBJECT(evtbox), "visibility-notify-event", - G_CALLBACK(noticeview_visi_notify), noticeview); g_signal_connect(G_OBJECT(evtbox), "motion-notify-event", G_CALLBACK(noticeview_visi_notify), noticeview); g_signal_connect(G_OBJECT(evtbox), "leave-notify-event", -- 2.25.1