Mercurial > pidgin.yaz
diff pidgin/gtkimhtmltoolbar.h @ 29678:676494d92262
propagate from branch 'im.pidgin.pidgin' (head 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2)
to branch 'im.pidgin.cpw.attention_ui' (head f244d5d303fff82243cee52fe1794b9338ec4d16)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 07 Apr 2009 08:12:56 +0000 |
| parents | 1a94a964bddf ae24e54a5014 |
| children | ce876e58cf6a |
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.h Tue Apr 07 05:28:58 2009 +0000 +++ b/pidgin/gtkimhtmltoolbar.h Tue Apr 07 08:12:56 2009 +0000 @@ -65,7 +65,8 @@ GtkWidget *image; GtkWidget *link; GtkWidget *smiley; - + GtkWidget *attention; + GtkWidget *font_dialog; GtkWidget *fgcolor_dialog; GtkWidget *bgcolor_dialog; @@ -77,6 +78,8 @@ GtkWidget *strikethrough; GtkWidget *insert_hr; GtkWidget *call; + + PurpleConversation *active_conv; }; struct _GtkIMHtmlToolbarClass { @@ -90,6 +93,8 @@ void gtk_imhtmltoolbar_attach (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml); void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id); +void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar, + PurpleConversation *conv); #ifdef __cplusplus }