diff pidgin/gtkimhtmltoolbar.h @ 32711:dc44bb639e8e

propagate from branch 'im.pidgin.pidgin' (head 069350831810b6f4bd534a26fed03260a9b4adcd) to branch 'im.pidgin.cpw.qulogic.gtk3' (head cf49f6cfd58e227b28dc1822e5ab543bbabd80b7)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 04 Jan 2012 02:37:25 +0000
parents 34f778db624f 763d65f3f758
children
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.h	Wed Jan 04 02:35:22 2012 +0000
+++ b/pidgin/gtkimhtmltoolbar.h	Wed Jan 04 02:37:25 2012 +0000
@@ -44,7 +44,11 @@
 
 	GtkWidget *imhtml;
 
+#if GTK_CHECK_VERSION(2,12,0)
+	gpointer depr1;
+#else
 	GtkTooltips *tooltips;
+#endif
 
 	GtkWidget *bold;
 	GtkWidget *italic;