Mercurial > pidgin
changeset 18054:0c70c55506cf
Remove duplicate code from a bad merge.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 07 Jun 2007 03:10:21 +0000 |
| parents | 891f22c7e884 |
| children | 0c7e3e81c434 |
| files | pidgin/gtkimhtmltoolbar.c |
| diffstat | 1 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.c Wed Jun 06 16:00:27 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Thu Jun 07 03:10:21 2007 +0000 @@ -1238,19 +1238,3 @@ g_free(toolbar->sml); toolbar->sml = g_strdup(proto_id); } - g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar); - g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set", G_CALLBACK(mark_set_cb), toolbar); - - buttons = gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml)); - update_buttons_cb(GTK_IMHTML(imhtml), buttons, toolbar); - - gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline); - - update_buttons(toolbar); -} - -void gtk_imhtmltoolbar_associate_smileys(GtkIMHtmlToolbar *toolbar, const char *proto_id) -{ - g_free(toolbar->sml); - toolbar->sml = g_strdup(proto_id); -}