diff pidgin/gtkblist.h @ 32582:816f62c582d9

Start converting Buddy List to new UI Manager code. Some auto-generated sections are not done yet.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 26 Jul 2009 06:10:10 +0000
parents 4b8c4870b13a
children 2bc917bbd07e
line wrap: on
line diff
--- a/pidgin/gtkblist.h	Sat Jul 25 20:46:43 2009 +0000
+++ b/pidgin/gtkblist.h	Sun Jul 26 06:10:10 2009 +0000
@@ -82,7 +82,15 @@
 
 	GtkCellRenderer *text_rend;
 
+#if GTK_CHECK_VERSION(2,4,0)
+	GtkUIManager *ui;
+	/* Hmm, can I put these here? */
+	guint plugins_merge_id;
+	guint accounts_merge_id;
+	guint sort_methods_merge_id;
+#else
 	GtkItemFactory *ift;
+#endif
 	GtkWidget *menutray;            /**< The menu tray widget. */
 	GtkWidget *menutrayicon;        /**< The menu tray icon. */