Mercurial > pidgin
changeset 8883:7e6ab16d3549
[gaim-migrate @ 9652]
Eradicate "Send urls as links"
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 06 May 2004 05:03:05 +0000 |
| parents | 25344c2d74c4 |
| children | dd6b4f259f5b |
| files | src/conversation.c src/gaimrc.c src/gtkprefs.c |
| diffstat | 3 files changed, 1 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Thu May 06 04:58:49 2004 +0000 +++ b/src/conversation.c Thu May 06 05:03:05 2004 +0000 @@ -177,11 +177,8 @@ conv->send_history = g_list_prepend(first, NULL); - if ((gc->flags & GAIM_CONNECTION_HTML) && - gaim_prefs_get_bool("/core/conversations/send_urls_as_links")) { - + if (gc->flags & GAIM_CONNECTION_HTML) displayed = gaim_markup_linkify(message); - } else displayed = g_strdup(message); @@ -2611,7 +2608,6 @@ /* Conversations */ gaim_prefs_add_none("/core/conversations"); - gaim_prefs_add_bool("/core/conversations/send_urls_as_links", TRUE); gaim_prefs_add_bool("/core/conversations/away_back_on_send", TRUE); gaim_prefs_add_bool("/core/conversations/use_alias_for_title", TRUE); gaim_prefs_add_bool("/core/conversations/combine_chat_im", FALSE);
--- a/src/gaimrc.c Thu May 06 04:58:49 2004 +0000 +++ b/src/gaimrc.c Thu May 06 05:03:05 2004 +0000 @@ -879,8 +879,6 @@ general_options & OPT_GEN_ENTER_SENDS); gaim_prefs_set_bool("/gaim/gtk/conversations/im/raise_on_events", general_options & OPT_GEN_POPUP_WINDOWS); - gaim_prefs_set_bool("/core/conversations/send_urls_as_links", - general_options & OPT_GEN_SEND_LINKS); gaim_prefs_set_bool("/gaim/gtk/debug/enabled", general_options & OPT_GEN_DEBUG); #ifndef _WIN32 @@ -995,8 +993,6 @@ convo_options = atoi(p->value[0]); gaim_prefs_set_bool("/gaim/gtk/conversations/enter_sends", convo_options & OPT_CONVO_ENTER_SENDS); - gaim_prefs_set_bool("/core/conversations/send_urls_as_links", - convo_options & OPT_CONVO_SEND_LINKS); gaim_prefs_set_bool("/gaim/gtk/conversations/spellcheck", convo_options & OPT_CONVO_CHECK_SPELLING); gaim_prefs_set_bool("/gaim/gtk/conversations/html_shortcuts",
--- a/src/gtkprefs.c Thu May 06 04:58:49 2004 +0000 +++ b/src/gtkprefs.c Thu May 06 05:03:05 2004 +0000 @@ -888,10 +888,6 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_size_group_add_widget(sg, label); -#if 0 /* PREFSLASH04 */ - gaim_gtk_prefs_checkbox(_("Send _URLs as links"), - "/core/conversations/send_urls_as_links", vbox); -#endif /* PREFSLASH04 */ gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"), "/gaim/gtk/conversations/show_formatting_toolbar", vbox);