[Gaim-commits] CVS: gaim/src/protocols/msn httpconn.c,1.8,1.9 slp.c,1.29,1.30 slpcall.h,1.5,1.6

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19790/src/protocols/msn

Modified Files:
	httpconn.c slp.c slpcall.h 
Log Message:
Some more deworming.  I mean, dewarning.
I also realized that lots of glib uses guchar* instead of guint* for
passing around bits of binary data, so I changed some stuff in util.c
that I'd already changed.


Index: httpconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/httpconn.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- httpconn.c	24 Mar 2005 04:09:46 -0000	1.8
+++ httpconn.c	21 Jul 2005 05:49:47 -0000	1.9
@@ -105,7 +105,7 @@ msn_httpconn_proxy_auth(MsnHttpConn *htt
 	if (username != NULL) {
 		char *tmp;
 		auth = g_strdup_printf("%s:%s", username, password ? password : "");
-		tmp = gaim_base64_encode(auth, strlen(auth));
+		tmp = gaim_base64_encode((const guchar *)auth, strlen(auth));
 		g_free(auth);
 		auth = g_strdup_printf("Proxy-Authorization: Basic %s\r\n", tmp);
 		g_free(tmp);

Index: slp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slp.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- slp.c	19 Jul 2005 05:15:44 -0000	1.29
+++ slp.c	21 Jul 2005 05:49:47 -0000	1.30
@@ -152,8 +152,8 @@ msn_xfer_end_cb(MsnSlpCall *slpcall)
 }
 
 void
-msn_xfer_completed_cb(MsnSlpCall *slpcall, const char *body,
-					  long long size)
+msn_xfer_completed_cb(MsnSlpCall *slpcall, guchar *body,
+					  gsize size)
 {
 	gaim_xfer_set_completed(slpcall->xfer, TRUE);
 }
@@ -755,9 +755,9 @@ msn_p2p_msg(MsnCmdProc *cmdproc, MsnMess
 	msn_slplink_process_msg(slplink, msg);
 }
 
-void
+static void
 got_emoticon(MsnSlpCall *slpcall,
-			 const char *data, long long size)
+			 const guchar *data, gsize size)
 {
 
 	GaimConversation *conv;
@@ -945,7 +945,7 @@ msn_queue_buddy_icon_request(MsnUser *us
 
 void
 got_user_display(MsnSlpCall *slpcall,
-				 const char *data, long long size)
+				 const guchar *data, gsize size)
 {
 	MsnUserList *userlist;
 	const char *info;

Index: slpcall.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slpcall.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- slpcall.h	2 Dec 2004 16:07:26 -0000	1.5
+++ slpcall.h	21 Jul 2005 05:49:47 -0000	1.6
@@ -24,10 +24,12 @@
 #ifndef _MSN_SLPCALL_H_
 #define _MSN_SLPCALL_H_
 
+#include "internal.h"
+
 typedef struct _MsnSlpCall MsnSlpCall;
 
 typedef void (*MsnSlpCb)(MsnSlpCall *slpcall,
-						 const char *data, long long size);
+						 const guchar *data, gsize size);
 typedef void (*MsnSlpEndCb)(MsnSlpCall *slpcall);
 
 #include "slplink.h"