Mercurial > pidgin.yaz

comparison pidgin/gtkimhtmltoolbar.h @ 32779:d72f2f13b60f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'c8c73eea7431e6f940916315ace40a41c8da3faa' and 'fec428131bde0ae8247941bd6a3d996c984c9189'
author Ethan Blanton <elb@pidgin.im>
date Fri, 21 Oct 2011 14:36:18 +0000
parents 02a2e8183b1d
children 0f94ec89f0bc f7072a6dc43d
comparison
equal deleted inserted replaced
32778:14787acaf9d7 32779:d72f2f13b60f
88 GtkWidget* gtk_imhtmltoolbar_new (void); 88 GtkWidget* gtk_imhtmltoolbar_new (void);
89 89
90 void gtk_imhtmltoolbar_attach (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml); 90 void gtk_imhtmltoolbar_attach (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml);
91 void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id); 91 void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id);
92 92
93 /**
94 * @since 2.7.0
95 */
96 void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar, 93 void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar,
97 PurpleConversation *conv); 94 PurpleConversation *conv);
98 95
99 #ifdef __cplusplus 96 #ifdef __cplusplus
100 } 97 }