diff -r 169ee59389a1 -r 305b415e90d6 pidgin/gtkblist.h --- 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. */