Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 12064:658623020748
[gaim-migrate @ 14359]
SF Patch #1355592 from Sadrul
'If I uncheck the "Show formatting on incoming
messages", then it also starts ignoring the format of
the outgoing messages -- which I don't believe is the
intended behaviour. This patch fixes that.'
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 13 Nov 2005 01:03:43 +0000 |
| parents | 29dc8fc0dd6c |
| children | e859c1663a27 |
comparison
equal
deleted
inserted
replaced
| 12063:cb9d1a005aef | 12064:658623020748 |
|---|---|
| 4163 sml_attrib = g_strdup_printf("sml=\"%s\"", | 4163 sml_attrib = g_strdup_printf("sml=\"%s\"", |
| 4164 gaim_account_get_protocol_name(conv->account)); | 4164 gaim_account_get_protocol_name(conv->account)); |
| 4165 | 4165 |
| 4166 gtk_font_options |= GTK_IMHTML_NO_COMMENTS; | 4166 gtk_font_options |= GTK_IMHTML_NO_COMMENTS; |
| 4167 | 4167 |
| 4168 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/show_incoming_formatting")) | 4168 if ((flags & GAIM_MESSAGE_RECV) && |
| 4169 !gaim_prefs_get_bool("/gaim/gtk/conversations/show_incoming_formatting")) | |
| 4169 gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING; | 4170 gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING; |
| 4170 | 4171 |
| 4171 /* this is gonna crash one day, I can feel it. */ | 4172 /* this is gonna crash one day, I can feel it. */ |
| 4172 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & | 4173 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & |
| 4173 OPT_PROTO_USE_POINTSIZE) { | 4174 OPT_PROTO_USE_POINTSIZE) { |