Mercurial > pidgin.yaz
diff src/gtkrequest.c @ 10181:5b33637b69fd
[gaim-migrate @ 11296]
Update a few more places to use the gtkimhtml factory thingy.
Look at the changes to gtkrequest.c to see how much duplicate
code this removes...
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 14 Nov 2004 20:29:28 +0000 |
parents | 3f71f7282dbf |
children | ecf3ce2e2ab1 |
line wrap: on
line diff
--- a/src/gtkrequest.c Sun Nov 14 20:26:27 2004 +0000 +++ b/src/gtkrequest.c Sun Nov 14 20:29:28 2004 +0000 @@ -336,52 +336,15 @@ if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) { GtkWidget *frame; - GtkWidget *vbox2; - GtkWidget *sep; - GtkWidget *sw; - /* Thin frame surrounding the toolbar and imhtml */ - frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); + /* imhtml */ + frame = gaim_gtk_create_imhtml(TRUE, &entry, &toolbar); + gtk_widget_set_size_request(entry, 320, 130); + gtk_widget_set_name(entry, "gaim_gtkrequest_imhtml"); + if (default_value != NULL) + gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL); gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); gtk_widget_show(frame); - - vbox2 = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(frame), vbox2); - gtk_widget_show(vbox2); - - sw = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - gtk_widget_set_size_request(sw, 320, 130); - - /* Toolbar */ - toolbar = gtk_imhtmltoolbar_new(); - gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0); - - /* Separator */ - sep = gtk_hseparator_new(); - gtk_box_pack_start(GTK_BOX(vbox2), sep, FALSE, FALSE, 0); - gtk_widget_show(sep); - - /* GtkIMHtml */ - entry = gtk_imhtml_new(NULL, NULL); - gtk_widget_set_name(entry, "gaim_gtkrequest_imhtml"); - gtk_imhtml_set_editable(GTK_IMHTML(entry), TRUE); - - gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), entry); - - if (default_value != NULL) - gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL); - - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR); - - gtk_box_pack_start(GTK_BOX(vbox2), sw, TRUE, TRUE, 0); - - if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) - gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(entry)); - - gtk_container_add(GTK_CONTAINER(sw), entry); } else { if (multiline) {