From afe076473f3b18c2d0ec402b43345eda6709c91a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 17 Dec 2005 13:40:47 +0100
Subject: Changed filenames of IM modules (jabberr, msnn, etc, didn't really
 make sense)

---
 protocols/jabber/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols/jabber')

diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
index df326fe6..9b414dc8 100644
--- a/protocols/jabber/Makefile
+++ b/protocols/jabber/Makefile
@@ -15,7 +15,7 @@ CFLAGS += -Wall
 LFLAGS += -r
 
 # [SH] Phony targets
-all: jabberr.o
+all: jabber_mod.o
 
 .PHONY: all clean distclean
 
@@ -32,6 +32,6 @@ $(objects): %.o: %.c
 	@echo '*' Compiling $<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
-jabberr.o: $(objects)
-	@echo '*' Linking jabberr.o
-	@$(LD) $(LFLAGS) $(objects) -o jabberr.o
+jabber_mod.o: $(objects)
+	@echo '*' Linking jabber_mod.o
+	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-- 
cgit v1.2.3


From 1fa6a235283df04233a5dced99ab9a924bfb65f9 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 20 Dec 2005 21:53:38 +0100
Subject: Jabber module now requests the buddy list before setting an away
 state, this was at least one cause of not seeing someone online. I'm afraid
 there are more (there's at least one more I know about), as mentioned in #15.

---
 protocols/jabber/jabber.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'protocols/jabber')

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index fc419124..c9fd4e3a 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -1248,14 +1248,10 @@ static void jabber_handleauthresp(gjconn gjc, jpacket p)
 			}
 			gjab_auth(gjc);
 		} else {
+			gjab_reqroster(gjc);
 			account_online(GJ_GC(gjc));
-
-			if (bud_list_cache_exists(GJ_GC(gjc)))
-				do_import(GJ_GC(gjc), NULL);
-
+			
 			((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;
-
-			gjab_reqroster(gjc);
 		}
 	} else {
 		xmlnode xerr;
-- 
cgit v1.2.3


From a252c1ad43823eb935148a5578ee0d666902b2f1 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 31 Dec 2005 21:29:15 +0100
Subject: Removed useless UTF8-related functions (iconv works a lot better).

---
 protocols/jabber/jabber.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'protocols/jabber')

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index c9fd4e3a..d4b5bde5 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -1855,11 +1855,7 @@ static void jabber_set_away(struct gaim_connection *gc, char *state, char *messa
 			y = xmlnode_insert_tag(x, "show");
 			xmlnode_insert_cdata(y, "away", -1);
 			y = xmlnode_insert_tag(x, "status");
-			{
-				char *utf8 = str_to_utf8(message);
-				xmlnode_insert_cdata(y, utf8, -1);
-				g_free(utf8);
-			}
+			xmlnode_insert_cdata(y, message, -1);
 			gc->away = "";
 		} else {
 			/* Gaim wants us to not be away */
-- 
cgit v1.2.3