Mercurial > pidgin
diff pidgin/gtkblist.h @ 32673:787609e41f20
explicit merge of 'f3961bf768b8a93583640b6058ba23d7f2c73c67'
and '60b08bb268ca62ab52c6223839341566e945a61d'
to branch 'im.pidgin.cpw.qulogic.gtk3'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 08 Oct 2011 21:13:43 +0000 |
parents | 02a2e8183b1d 82f26939d2ba |
children | dc44bb639e8e |
line wrap: on
line diff
--- a/pidgin/gtkblist.h Sat Oct 08 07:44:40 2011 +0000 +++ b/pidgin/gtkblist.h Sat Oct 08 21:13:43 2011 +0000 @@ -82,7 +82,7 @@ GtkCellRenderer *text_rend; - GtkItemFactory *ift; + GtkUIManager *ui; GtkWidget *menutray; /**< The menu tray widget. */ GtkWidget *menutrayicon; /**< The menu tray icon. */