comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 15663
- 47c40802ea76
- parent 15640
- 157dcf81a8d6
- child 15679
- 4d2def31970b
equal
deleted
inserted
replaced
| 15662:32183d526c28 | 15663:47c40802ea76 |
|---|---|
| 4930 gtk_font_options |= GTK_IMHTML_USE_POINTSIZE; | 4930 gtk_font_options |= GTK_IMHTML_USE_POINTSIZE; |
| 4931 } | 4931 } |
| 4932 | 4932 |
| 4933 | 4933 |
| 4934 /* TODO: These colors should not be hardcoded so log.c can use them */ | 4934 /* TODO: These colors should not be hardcoded so log.c can use them */ |
| 4935 if (flags & GAIM_MESSAGE_SYSTEM) { | 4935 if (flags & GAIM_MESSAGE_RAW) { |
| 4936 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, gtk_font_options_all); | |
| 4937 } else if (flags & GAIM_MESSAGE_SYSTEM) { | |
| 4936 g_snprintf(buf2, sizeof(buf2), | 4938 g_snprintf(buf2, sizeof(buf2), |
| 4937 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", | 4939 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", |
| 4938 sml_attrib ? sml_attrib : "", mdate, displaying); | 4940 sml_attrib ? sml_attrib : "", mdate, displaying); |
| 4939 | 4941 |
| 4940 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); | 4942 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); |
| 4950 g_snprintf(buf2, BUF_LONG, | 4952 g_snprintf(buf2, BUF_LONG, |
| 4951 "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>", | 4953 "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>", |
| 4952 sml_attrib ? sml_attrib : "", displaying); | 4954 sml_attrib ? sml_attrib : "", displaying); |
| 4953 | 4955 |
| 4954 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); | 4956 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); |
| 4955 } else if (flags & GAIM_MESSAGE_RAW) { | |
| 4956 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), displaying, gtk_font_options_all); | |
| 4957 } else { | 4957 } else { |
| 4958 char *new_message = g_memdup(displaying, length); | 4958 char *new_message = g_memdup(displaying, length); |
| 4959 char *alias_escaped = (alias ? g_markup_escape_text(alias, strlen(alias)) : g_strdup("")); | 4959 char *alias_escaped = (alias ? g_markup_escape_text(alias, strlen(alias)) : g_strdup("")); |
| 4960 /* The initial offset is to deal with | 4960 /* The initial offset is to deal with |
| 4961 * escaped entities making the string longer */ | 4961 * escaped entities making the string longer */ |
