comparison: src/conversation.c
src/conversation.c
- changeset 491
- 2218ae1ab7bb
- parent 488
- e1ec77ef4cf3
- child 494
- bab001e4c83d
equal
deleted
inserted
replaced
| 490:b2a9198f7e7c | 491:2218ae1ab7bb |
|---|---|
| 894 gtk_html_freeze(GTK_HTML(c->text)); | 894 gtk_html_freeze(GTK_HTML(c->text)); |
| 895 | 895 |
| 896 gtk_html_append_text(GTK_HTML(c->text), what, 0); | 896 gtk_html_append_text(GTK_HTML(c->text), what, 0); |
| 897 | 897 |
| 898 gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0); | 898 gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0); |
| 899 | |
| 900 gtk_html_thaw(GTK_HTML(c->text)); | |
| 901 | 899 |
| 902 if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) { | 900 if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) { |
| 903 char *t1; | 901 char *t1; |
| 904 | 902 |
| 905 if (general_options & OPT_GEN_STRIP_HTML) { | 903 if (general_options & OPT_GEN_STRIP_HTML) { |
| 1056 } | 1054 } |
| 1057 | 1055 |
| 1058 gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0); | 1056 gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0); |
| 1059 | 1057 |
| 1060 | 1058 |
| 1061 gtk_html_thaw(GTK_HTML(c->text)); | |
| 1062 | |
| 1063 if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) { | 1059 if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) { |
| 1064 char *t1, *t2; | 1060 char *t1, *t2; |
| 1065 char *nm = g_malloc(256); | 1061 char *nm = g_malloc(256); |
| 1066 if (c->is_chat) | 1062 if (c->is_chat) |
| 1067 g_snprintf(nm, 256, "%s.chat", c->name); | 1063 g_snprintf(nm, 256, "%s.chat", c->name); |
| 1096 */ | 1092 */ |
| 1097 | 1093 |
| 1098 if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) || | 1094 if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) || |
| 1099 (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS))) | 1095 (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS))) |
| 1100 gdk_window_show(c->window->window); | 1096 gdk_window_show(c->window->window); |
| 1097 | |
| 1098 gtk_html_thaw(GTK_HTML(c->text)); | |
| 1101 | 1099 |
| 1102 g_free(smiley); | 1100 g_free(smiley); |
| 1103 g_free(buf); | 1101 g_free(buf); |
| 1104 g_free(buf2); | 1102 g_free(buf2); |
| 1105 } | 1103 } |
