comparison: pidgin/gtkrequest.c
pidgin/gtkrequest.c
- changeset 33193
- 8d687d033529
- parent 33170
- ce4447562d64
- child 33195
- fc0195d8a917
equal
deleted
inserted
replaced
| 33192:1ecdf6926526 | 33193:8d687d033529 |
|---|---|
| 28 | 28 |
| 29 #include "debug.h" | 29 #include "debug.h" |
| 30 #include "prefs.h" | 30 #include "prefs.h" |
| 31 #include "util.h" | 31 #include "util.h" |
| 32 | 32 |
| 33 #include "gtkimhtml.h" | 33 #include "gtkwebview.h" |
| 34 #include "gtkimhtmltoolbar.h" | |
| 35 #include "gtkrequest.h" | 34 #include "gtkrequest.h" |
| 36 #include "gtkutils.h" | 35 #include "gtkutils.h" |
| 37 #include "pidginstock.h" | 36 #include "pidginstock.h" |
| 38 #include "gtkblist.h" | 37 #include "gtkblist.h" |
| 39 | 38 |
| 147 | 146 |
| 148 gtk_text_buffer_get_start_iter(buffer, &start_iter); | 147 gtk_text_buffer_get_start_iter(buffer, &start_iter); |
| 149 gtk_text_buffer_get_end_iter(buffer, &end_iter); | 148 gtk_text_buffer_get_end_iter(buffer, &end_iter); |
| 150 | 149 |
| 151 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) | 150 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) |
| 152 multiline_value = gtk_imhtml_get_markup(GTK_IMHTML(data->u.input.entry)); | 151 multiline_value = gtk_webview_get_body_html(GTK_WEBVIEW(data->u.input.entry)); |
| 153 else | 152 else |
| 154 multiline_value = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter, | 153 multiline_value = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter, |
| 155 FALSE); | 154 FALSE); |
| 156 | 155 |
| 157 value = multiline_value; | 156 value = multiline_value; |
| 421 gtk_widget_show_all(hbox); | 420 gtk_widget_show_all(hbox); |
| 422 | 421 |
| 423 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) { | 422 if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) { |
| 424 GtkWidget *frame; | 423 GtkWidget *frame; |
| 425 | 424 |
| 426 /* imhtml */ | 425 /* webview */ |
| 427 frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL); | 426 frame = pidgin_create_webview(TRUE, &entry, &toolbar, NULL); |
| 428 gtk_widget_set_size_request(entry, 320, 130); | 427 gtk_widget_set_size_request(entry, 320, 130); |
| 429 gtk_widget_set_name(entry, "pidgin_request_imhtml"); | 428 gtk_widget_set_name(entry, "pidgin_request_webview"); |
| 430 if (default_value != NULL) | 429 if (default_value != NULL) { |
| 431 gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL); | 430 char *tmp = g_markup_escape_text(default_value, -1); |
| 431 gtk_webview_append_html(GTK_WEBVIEW(entry), tmp); | |
| 432 g_free(tmp); | |
| 433 } | |
| 432 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); | 434 gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); |
| 433 gtk_widget_show(frame); | 435 gtk_widget_show(frame); |
| 434 | |
| 435 gtk_imhtml_set_return_inserts_newline(GTK_IMHTML(entry)); | |
| 436 } | 436 } |
| 437 else { | 437 else { |
| 438 if (multiline) { | 438 if (multiline) { |
| 439 /* GtkTextView */ | 439 /* GtkTextView */ |
| 440 entry = gtk_text_view_new(); | 440 entry = gtk_text_view_new(); |
