# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 965453724 0
# Node ID 874ed877c854e9eacdb9ef3333893d1438a93e46
# Parent  9f168ba28ac256ae1f1cc3461c6e69410480e9d4
[gaim-migrate @ 626]
Gaim automatically linkifies incoming messages.  Yeah, Syd, you owe me one ;-0

committer: Tailor Script <tailor@pidgin.im>

diff -r 9f168ba28ac2 -r 874ed877c854 src/prefs.c
--- a/src/prefs.c	Sat Aug 05 04:38:19 2000 +0000
+++ b/src/prefs.c	Sat Aug 05 05:35:24 2000 +0000
@@ -393,7 +393,7 @@
 	gaim_button(_("Strip HTML from log files"), &general_options, OPT_GEN_STRIP_HTML, genbox);
 	gaim_button(_("Raise windows when message recieved"), &general_options, OPT_GEN_POPUP_WINDOWS, genbox);
 	gaim_button(_("Raise chat windows when people speak"), &general_options, OPT_GEN_POPUP_CHAT, genbox);
-        gaim_button(_("Send URLs as links"), &general_options, OPT_GEN_SEND_LINKS, genbox);
+        gaim_button(_("Show URLs as links"), &general_options, OPT_GEN_SEND_LINKS, genbox);
 	gaim_button(_("Show Lag-O-Meter"), &general_options, OPT_GEN_SHOW_LAGMETER, genbox);
         gaim_button(_("Save some window size/positions"), &general_options, OPT_GEN_SAVED_WINDOWS, genbox);
         gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, genbox);
diff -r 9f168ba28ac2 -r 874ed877c854 src/server.c
--- a/src/server.c	Sat Aug 05 04:38:19 2000 +0000
+++ b/src/server.c	Sat Aug 05 05:35:24 2000 +0000
@@ -683,6 +683,11 @@
 	g_free(nname);
 	
         cnv = find_conversation(name);
+
+	if (general_options & OPT_GEN_SEND_LINKS) {
+		linkify_text(message);
+	}
+	
 	if (away) away = WFLAG_AUTO;
 
 	if (awaymessage != NULL) {