commit 8c1ab26326efaaf610ab6dbbae33a833442d1137
parent bfdc6088541a7ebcc4285c5c15b734eaa6ba0b33
Author: Paul Mangan <paul@claws-mail.org>
Date: Thu, 25 Mar 2010 09:38:48 +0000
2010-03-25 [paul] 3.7.5cvs39
* src/gtk/gtkcmclist.c
Fix build with GTK+ 2.20
Diffstat:
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-25 [paul] 3.7.5cvs39
+
+ * src/gtk/gtkcmclist.c
+ Fix build with GTK+ 2.20
+
2010-03-24 [pawel] 3.7.5cvs38
* src/addr_compl.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3979,3 +3979,4 @@
( cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/grouplistdialog.c; cvs diff -u -r 1.204.2.194 -r 1.204.2.195 src/prefs_common.c; cvs diff -u -r 1.103.2.127 -r 1.103.2.128 src/prefs_common.h; ) > 3.7.5cvs36.patchset
( cvs diff -u -r 1.274.2.307 -r 1.274.2.308 src/mainwindow.c; cvs diff -u -r 1.83.2.161 -r 1.83.2.162 src/mimeview.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/gtkcmctree.c; ) > 3.7.5cvs37.patchset
( cvs diff -u -r 1.27.2.46 -r 1.27.2.47 src/addr_compl.c; cvs diff -u -r 1.382.2.547 -r 1.382.2.548 src/compose.c; cvs diff -u -r 1.207.2.215 -r 1.207.2.216 src/folderview.c; cvs diff -u -r 1.14.2.25 -r 1.14.2.26 src/grouplistdialog.c; cvs diff -u -r 1.8.2.30 -r 1.8.2.31 src/headerview.c; cvs diff -u -r 1.274.2.308 -r 1.274.2.309 src/mainwindow.c; cvs diff -u -r 1.83.2.162 -r 1.83.2.163 src/mimeview.c; cvs diff -u -r 1.105.2.158 -r 1.105.2.159 src/prefs_account.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/gtkshruler.c; cvs diff -u -r 1.5.2.89 -r 1.5.2.90 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.48 -r 1.4.2.49 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/spell_entry.c; cvs diff -u -r 1.14.2.70 -r 1.14.2.71 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/plugins/trayicon/libeggtrayicon/Makefile.am; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; ) > 3.7.5cvs38.patchset
+( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmclist.c; ) > 3.7.5cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/gtkcmclist.c b/src/gtk/gtkcmclist.c
@@ -1477,9 +1477,15 @@ gtk_cmclist_column_title_passive (GtkCMCList *clist,
clist->column[column].button_passive = TRUE;
if (button->button_down)
- gtk_button_released (button);
+ g_signal_connect(G_OBJECT (clist->column[column].button),
+ "button-release-event",
+ G_CALLBACK(column_title_passive_func),
+ NULL);
if (button->in_button)
- gtk_button_leave (button);
+ g_signal_connect(G_OBJECT (clist->column[column].button),
+ "leave-notify-event",
+ G_CALLBACK(column_title_passive_func),
+ NULL);
g_signal_connect (G_OBJECT (clist->column[column].button), "event",
G_CALLBACK(column_title_passive_func), NULL);
