Mercurial > pidgin
comparison pidgin/gtkimhtmltoolbar.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 9a0990fd41ed |
| children | 763d65f3f758 |
comparison
equal
deleted
inserted
replaced
| 32269:599f8901a5e0 | 32673:787609e41f20 |
|---|---|
| 44 struct _GtkIMHtmlToolbar { | 44 struct _GtkIMHtmlToolbar { |
| 45 GtkHBox box; | 45 GtkHBox box; |
| 46 | 46 |
| 47 GtkWidget *imhtml; | 47 GtkWidget *imhtml; |
| 48 | 48 |
| 49 #if GTK_CHECK_VERSION(2,12,0) | |
| 50 gpointer depr1; | |
| 51 #else | |
| 49 GtkTooltips *tooltips; | 52 GtkTooltips *tooltips; |
| 53 #endif | |
| 50 | 54 |
| 51 GtkWidget *bold; | 55 GtkWidget *bold; |
| 52 GtkWidget *italic; | 56 GtkWidget *italic; |
| 53 GtkWidget *underline; | 57 GtkWidget *underline; |
| 54 | 58 |