Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 32269:599f8901a5e0 | 32673:787609e41f20 |
|---|---|
| 80 GtkTreeStore *treemodel; /**< This is the treemodel. */ | 80 GtkTreeStore *treemodel; /**< This is the treemodel. */ |
| 81 GtkTreeViewColumn *text_column; /**< Column */ | 81 GtkTreeViewColumn *text_column; /**< Column */ |
| 82 | 82 |
| 83 GtkCellRenderer *text_rend; | 83 GtkCellRenderer *text_rend; |
| 84 | 84 |
| 85 GtkItemFactory *ift; | 85 GtkUIManager *ui; |
| 86 GtkWidget *menutray; /**< The menu tray widget. */ | 86 GtkWidget *menutray; /**< The menu tray widget. */ |
| 87 GtkWidget *menutrayicon; /**< The menu tray icon. */ | 87 GtkWidget *menutrayicon; /**< The menu tray icon. */ |
| 88 | 88 |
| 89 guint refresh_timer; /**< The timer for refreshing every 30 seconds */ | 89 guint refresh_timer; /**< The timer for refreshing every 30 seconds */ |
| 90 | 90 |