diff src/protocols/silc/silc.c @ 11318:519dc2186438

[gaim-migrate @ 13521] Bits and pieces all over the place. I was hunting down compiler warnings all over the place, with crazy CFLAGS. I think I might have got a bit carried away. I made the perl stuff compile with gcc 2.x (which don't support mixed declerations and statements), I think what I did was safe but readily admit I have no clue how all the perl stuff works. Rename gaim_presence_add_presence() to gaim_presence_add_list() (to match the header file - obviously nothing actually _uses_ this) Implement gaim_savedstatus_get_handle() because it's in the header file. Remove gaim_account_set_presence() from account.h - it's not actually implemented anywhere, so it can't be that important. committer: Tailor Script <[e-mail]>

--- a/src/protocols/silc/silc.c	Fri Aug 19 20:06:37 2005 +0000
+++ b/src/protocols/silc/silc.c	Sat Aug 20 20:17:08 2005 +0000
@@ -181,7 +181,7 @@
 	/* Get session detachment data, if available */
 	memset(&params, 0, sizeof(params));
 	dfile = silcgaim_session_file(gaim_account_get_username(sg->account));
-	params.detach_data = silc_file_readfile(dfile, &params.detach_data_len);
+	params.detach_data = (unsigned char *)silc_file_readfile(dfile, &params.detach_data_len);
 	if (params.detach_data)
 		params.detach_data[params.detach_data_len] = 0;
 
@@ -524,7 +524,7 @@
 		tmp = silc_file_readfile(val, &tmp_len);
 		if (tmp) {
 			tmp[tmp_len] = 0;
-			if (silc_vcard_decode(tmp, tmp_len, &vcard))
+			if (silc_vcard_decode((unsigned char *)tmp, tmp_len, &vcard))
 				silc_client_attribute_add(client, conn,
 							  SILC_ATTRIBUTE_USER_INFO,
 							  (void *)&vcard,
@@ -835,7 +835,7 @@
 
 typedef struct {
 	char *nick;
-	unsigned char *message;
+	char *message;
 	SilcUInt32 message_len;
 	SilcMessageFlags flags;
 } *SilcGaimIM;
@@ -880,7 +880,7 @@
 
 	/* Send the message */
 	silc_client_send_private_message(client, conn, client_entry, im->flags,
-					 im->message, im->message_len, TRUE);
+					 (unsigned char *)im->message, im->message_len, TRUE);
 	gaim_conv_im_write(GAIM_CONV_IM(convo), conn->local_entry->nickname,
 			   im->message, 0, time(NULL));
 
@@ -955,7 +955,7 @@
 
 	/* Send private message directly */
 	ret = silc_client_send_private_message(client, conn, clients[0],
-					       mflags, (char *)msg,
+					       mflags, (unsigned char *)msg,
 					       strlen(msg), TRUE);
 
 	silc_free(nickname);