Mercurial > pidgin.yaz
changeset 8458:9773e3f3ec7a
[gaim-migrate @ 9188]
who in their right mind would use strike through as a default font option?
and it didn't work right anyway.
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 16 Mar 2004 20:24:37 +0000 |
| parents | daeeb96cdf8f |
| children | 3afd1761da09 |
| files | src/gaimrc.c src/gtkconv.c src/gtkprefs.c src/gtkutils.c |
| diffstat | 4 files changed, 10 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gaimrc.c Tue Mar 16 19:43:58 2004 +0000 +++ b/src/gaimrc.c Tue Mar 16 20:24:37 2004 +0000 @@ -49,7 +49,7 @@ #define OPT_FONT_BOLD 0x00000001 #define OPT_FONT_ITALIC 0x00000002 #define OPT_FONT_UNDERLINE 0x00000008 -#define OPT_FONT_STRIKE 0x00000010 +/* We're going to ignore strikethough */ #define OPT_FONT_FACE 0x00000020 #define OPT_FONT_FGCOL 0x00000040 #define OPT_FONT_BGCOL 0x00000080 @@ -1102,8 +1102,6 @@ font_options & OPT_FONT_ITALIC); gaim_prefs_set_bool("/gaim/gtk/conversations/send_underline", font_options & OPT_FONT_UNDERLINE); - gaim_prefs_set_bool("/gaim/gtk/conversations/send_strikethrough", - font_options & OPT_FONT_STRIKE); gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_font", font_options & OPT_FONT_FACE); gaim_prefs_set_bool("/gaim/gtk/conversations/use_custom_size",
--- a/src/gtkconv.c Tue Mar 16 19:43:58 2004 +0000 +++ b/src/gtkconv.c Tue Mar 16 20:24:37 2004 +0000 @@ -234,14 +234,6 @@ if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline")) gtk_imhtml_toggle_underline(GTK_IMHTML(c->entry)); - if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_strikethrough")) - { - /* Tell me noone uses <s> by default ... maybe I won't do - _toggle_strikethrough and not let them */ - /* g_snprintf(buf2, limit, "<STRIKE>%s</STRIKE>", buf); - strcpy(buf, buf2); */ - } - if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_font") || c->has_font) { @@ -5736,7 +5728,6 @@ gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE); - gaim_prefs_add_bool("/gaim/gtk/conversations/send_strikethrough", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/show_smileys", TRUE); gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE);
--- a/src/gtkprefs.c Tue Mar 16 19:43:58 2004 +0000 +++ b/src/gtkprefs.c Tue Mar 16 20:24:37 2004 +0000 @@ -675,9 +675,17 @@ "/gaim/gtk/conversations/send_italic", vbox); gaim_gtk_prefs_checkbox(_("_Underline"), "/gaim/gtk/conversations/send_underline", vbox); +#if 0 + /*who in their right mind would use this as a default anyway? + * and plus, it wouldn't work as the code currently existed, + * and then i went and applied simguy's patch to remove the + * non-functional code. + * + * remove this after string freeze ends + */ gaim_gtk_prefs_checkbox(_("_Strikethrough"), "/gaim/gtk/conversations/send_strikethrough", vbox); - +#endif vbox = gaim_gtk_make_frame(ret, _("Face")); hbox = gtk_hbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(vbox), hbox);
--- a/src/gtkutils.c Tue Mar 16 19:43:58 2004 +0000 +++ b/src/gtkutils.c Tue Mar 16 20:24:37 2004 +0000 @@ -1018,11 +1018,6 @@ strcpy(buf, tmp); } - if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_strikethrough")) { - g_snprintf(tmp, length, "<S>%s</S>", buf); - strcpy(buf, tmp); - } - if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_font")) { const char *fontface;