Mercurial > pidgin.yaz
changeset 5599:340cb17d3e37
[gaim-migrate @ 6003]
fixination
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sat, 31 May 2003 14:43:08 +0000 |
| parents | 8b24e4d1e082 |
| children | c6565a8d4f23 |
| files | plugins/history.c src/protocols/jabber/jabber.c |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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__"