Mercurial > pidgin
changeset 8882:25344c2d74c4
[gaim-migrate @ 9651]
Eradicate "Show URLs as links"
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 06 May 2004 04:58:49 +0000 |
| parents | 1ab2a9c17f4a |
| children | 7e6ab16d3549 |
| files | src/gtkconv.c src/gtknotify.c src/gtkprefs.c src/server.c |
| diffstat | 4 files changed, 11 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Thu May 06 04:44:33 2004 +0000 +++ b/src/gtkconv.c Thu May 06 04:58:49 2004 +0000 @@ -5849,7 +5849,6 @@ gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE); - gaim_prefs_add_bool("/gaim/gtk/conversations/show_urls_as_links", TRUE); gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE); gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_colors", FALSE); gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_fonts", FALSE);
--- a/src/gtknotify.c Thu May 06 04:44:33 2004 +0000 +++ b/src/gtknotify.c Thu May 06 04:58:49 2004 +0000 @@ -375,18 +375,11 @@ gaim_gtk_find_images(text, &images); - if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) - { - linked_text = gaim_markup_linkify(text); - gtk_imhtml_append_text_with_images(GTK_IMHTML(imhtml), linked_text, - options, images); - g_free(linked_text); - } - else - { - gtk_imhtml_append_text_with_images(GTK_IMHTML(imhtml), text, - options, images); - } + /* Make sure URLs are clickable */ + linked_text = gaim_markup_linkify(text); + gtk_imhtml_append_text_with_images(GTK_IMHTML(imhtml), linked_text, + options, images); + g_free(linked_text); if (images) {
--- a/src/gtkprefs.c Thu May 06 04:44:33 2004 +0000 +++ b/src/gtkprefs.c Thu May 06 04:58:49 2004 +0000 @@ -759,10 +759,6 @@ vbox = gaim_gtk_make_frame (ret, _("Display")); gaim_gtk_prefs_checkbox(_("Show _timestamp on messages"), "/gaim/gtk/conversations/show_timestamps", vbox); -#if 0 /* PREFSLASH04 */ - gaim_gtk_prefs_checkbox(_("Show _URLs as links"), - "/gaim/gtk/conversations/show_urls_as_links", vbox); -#endif /* PREFSLASH04 */ #ifdef USE_GTKSPELL gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), "/gaim/gtk/conversations/spellcheck", vbox);
--- a/src/server.c Thu May 06 04:44:33 2004 +0000 +++ b/src/server.c Thu May 06 04:58:49 2004 +0000 @@ -885,15 +885,10 @@ message = buffy; - /* - * If you can't figure this out, stop reading right now. - * "We're not worthy! We're not worthy!" - */ - if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) { - buffy = gaim_markup_linkify(message); - g_free(message); - message = buffy; - } + /* Make sure URLs are clickable */ + buffy = gaim_markup_linkify(message); + g_free(message); + message = buffy; /* * Um. When we call gaim_conversation_write with the message we received, @@ -1555,12 +1550,8 @@ who = angel; message = buffy; - - - if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) - buf = gaim_markup_linkify(message); - else - buf = g_strdup(message); + /* Make sure URLs are clickable */ + buf = gaim_markup_linkify(message); if (whisper) w = GAIM_MESSAGE_WHISPER;