# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1054392188 0
# Node ID 340cb17d3e378cb720911a99706704f7ef78869a
# Parent  8b24e4d1e082806847ff4379805fb2b9a9833b5a
[gaim-migrate @ 6003]
fixination

committer: Tailor Script <tailor@pidgin.im>

diff -r 8b24e4d1e082 -r 340cb17d3e37 plugins/history.c
--- a/plugins/history.c	Sat May 31 14:38:03 2003 +0000
+++ b/plugins/history.c	Sat May 31 14:43:08 2003 +0000
@@ -4,6 +4,7 @@
 #include "config.h"
 
 #include "gaim.h"
+#include "prefs.h"
 #include "gtkimhtml.h"
 #include "gtkplugin.h"
 #include <sys/stat.h>
@@ -50,7 +51,8 @@
 	if(*tmp == '<')
 		options |= GTK_IMHTML_NO_NEWLINE;
 
-	if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) {		tmp2 = linkify_text(tmp);
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links"))
+		tmp2 = linkify_text(tmp);
 	else
 		tmp2 = g_strdup(tmp);
 
diff -r 8b24e4d1e082 -r 340cb17d3e37 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Sat May 31 14:38:03 2003 +0000
+++ b/src/protocols/jabber/jabber.c	Sat May 31 14:43:08 2003 +0000
@@ -66,7 +66,7 @@
 /* Confused? That makes three of us. -Robot101 */
 #define GC_GJ(x) ((gjconn)((struct jabber_data *)(x)->proto_data)->gjc)
 
-#define JABBER_CONNECT_STEPS 5
+#define JABBER_CONNECT_STEPS 4
 
 #define IQID_AUTH "__AUTH__"