Mercurial > pidgin.yaz

changeset 23760:b00579ec01be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '4f30170cef563ecf059bc5e798c3bd75d01247e7' and 'a9002d08e75602ce9bcf87e60a05f2b0c7862608'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 10 Aug 2008 22:59:07 +0000
parents 019d5ae3ad72 (diff) 80ce5ca985c2 (current diff)
children 86bef5b06f70
files libpurple/protocols/qq/crypt.c libpurple/protocols/qq/crypt.h libpurple/protocols/qq/group_network.c libpurple/protocols/qq/group_network.h
diffstat 10 files changed, 30 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.h	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/contact.h	Sun Aug 10 22:59:07 2008 +0000
@@ -26,6 +26,7 @@
 #define _MSN_CONTACT_H_
 
 #include "session.h"
+#include "soap.h"
 
 #define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11"
 
@@ -604,7 +605,7 @@
 	xmlnode *token;
 	const gchar *post_action;
 	const gchar *post_url;
-	/* MsnSoapCallback */ void *cb;
+	MsnSoapCallback cb;
 };
 
 typedef enum
--- a/libpurple/protocols/msn/directconn.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/directconn.c	Sun Aug 10 22:59:07 2008 +0000
@@ -162,13 +162,13 @@
 	return fd;
 }
 
-static size_t
+static gssize
 msn_directconn_write(MsnDirectConn *directconn,
 					 const char *data, size_t len)
 {
 	char *buffer, *tmp;
 	size_t buf_size;
-	size_t ret;
+	gssize ret;
 	guint32 sent_len;
 
 	g_return_val_if_fail(directconn != NULL, 0);
@@ -274,7 +274,8 @@
 {
 	MsnDirectConn* directconn;
 	char *body;
-	size_t len, body_len;
+	size_t body_len;
+	gssize len;
 
 	purple_debug_info("msn", "read_cb: %d, %d\n", source, cond);
 
--- a/libpurple/protocols/msn/httpconn.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/httpconn.c	Sun Aug 10 22:59:07 2008 +0000
@@ -274,7 +274,8 @@
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 	char *result_msg = NULL;
 	size_t result_len = 0;
 	gboolean error = FALSE;
@@ -405,7 +406,8 @@
 httpconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnHttpConn *httpconn;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	httpconn = data;
 	writelen = purple_circ_buffer_get_max_read(httpconn->tx_buf);
@@ -727,7 +729,8 @@
 	}
 	else
 	{
-		purple_debug_error("msn", "HTTP: Connection error\n");
+		purple_debug_error("msn", "HTTP: Connection error: %s\n",
+		                   error_message ? error_message : "(null)");
 		msn_servconn_got_error(httpconn->servconn, MSN_SERVCONN_ERROR_CONNECT);
 	}
 }
--- a/libpurple/protocols/msn/msn.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/msn.c	Sun Aug 10 22:59:07 2008 +0000
@@ -163,7 +163,7 @@
 
 	username = purple_conversation_get_name(conv);
 
-	serv_send_attention(gc, username, MSN_NUDGE);
+	purple_prpl_send_attention(gc, username, MSN_NUDGE);
 
 	return PURPLE_CMD_RET_OK;
 }
--- a/libpurple/protocols/msn/nexus.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/nexus.c	Sun Aug 10 22:59:07 2008 +0000
@@ -379,7 +379,8 @@
 {
 	MsnSession *session = nexus->session;
 	const char *username;
-	char *password;
+	const char *password;
+	char *password_xml;
 	GString *domains;
 	char *request;
 	int i;
@@ -390,7 +391,8 @@
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_GET_COOKIE);
 
 	username = purple_account_get_username(session->account);
-	password = g_markup_escape_text(purple_connection_get_password(session->account->gc), 16);
+	password = purple_connection_get_password(session->account->gc);
+	password_xml = g_markup_escape_text(password, MIN(strlen(password), 16));
 
 	purple_debug_info("msn", "Logging on %s, with policy '%s', nonce '%s'\n",
 	                  username, nexus->policy, nexus->nonce);
@@ -405,8 +407,8 @@
 		                           nexus->policy);
 	}
 
-	request = g_strdup_printf(MSN_SSO_TEMPLATE, username, password, domains->str);
-	g_free(password);
+	request = g_strdup_printf(MSN_SSO_TEMPLATE, username, password_xml, domains->str);
+	g_free(password_xml);
 	g_string_free(domains, TRUE);
 
 	soap = msn_soap_message_new(NULL, xmlnode_from_str(request, -1));
--- a/libpurple/protocols/msn/servconn.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/servconn.c	Sun Aug 10 22:59:07 2008 +0000
@@ -301,7 +301,8 @@
 servconn_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnServConn *servconn = data;
-	int ret, writelen;
+	gssize ret;
+	int writelen;
 
 	writelen = purple_circ_buffer_get_max_read(servconn->tx_buf);
 
@@ -385,7 +386,8 @@
 	MsnSession *session;
 	char buf[MSN_BUF_LEN];
 	char *cur, *end, *old_rx_buf;
-	int len, cur_len;
+	gssize len;
+	int cur_len;
 
 	servconn = data;
 	session = servconn->session;
@@ -399,7 +401,7 @@
 
 	} else if (len <= 0) {
 		purple_debug_error("msn", "servconn read error,"
-		                          "len: %d, errno: %d, error: %s\n",
+		                          "len: %" G_GSSIZE_FORMAT ", errno: %d, error: %s\n",
 		                          len, errno, g_strerror(errno));
 		msn_servconn_got_error(servconn, MSN_SERVCONN_ERROR_READ);
 
--- a/libpurple/protocols/msn/transaction.h	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msn/transaction.h	Sun Aug 10 22:59:07 2008 +0000
@@ -45,7 +45,7 @@
 	char *command;
 	char *params;
 
-	int timer;
+	guint timer;
 
 	void *data; /**< The data to be used on the different callbacks. */
 	GHashTable *callbacks;
--- a/libpurple/protocols/msnp9/msn.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/msnp9/msn.c	Sun Aug 10 22:59:07 2008 +0000
@@ -162,7 +162,7 @@
 
 	username = purple_conversation_get_name(conv);
 
-	serv_send_attention(gc, username, MSN_NUDGE);
+	purple_prpl_send_attention(gc, username, MSN_NUDGE);
 
 	return PURPLE_CMD_RET_OK;
 }
--- a/libpurple/protocols/myspace/zap.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/myspace/zap.c	Sun Aug 10 22:59:07 2008 +0000
@@ -183,7 +183,7 @@
 
 	zap = GPOINTER_TO_INT(zap_num_ptr);
 
-	serv_send_attention(session->gc, buddy->name, zap);
+	purple_prpl_send_attention(session->gc, buddy->name, zap);
 }
 
 /** Return menu, if any, for a buddy list node. */
@@ -241,7 +241,7 @@
 
 	zap = CLAMP(zap, 0, 9);
 
-	serv_got_attention(session->gc, username, zap);
+	purple_prpl_got_attention(session->gc, username, zap);
 
 	g_free(msg_text);
 	g_free(username);
--- a/libpurple/protocols/yahoo/yahoo.c	Sun Aug 10 21:49:23 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sun Aug 10 22:59:07 2008 +0000
@@ -871,7 +871,7 @@
 				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
 
 			username = g_markup_escape_text(im->from, -1);
-			serv_got_attention(gc, username, YAHOO_BUZZ);
+			purple_prpl_got_attention(gc, username, YAHOO_BUZZ);
 			g_free(username);
 			g_free(m);
 			g_free(im);
@@ -4096,7 +4096,7 @@
 	if (*args && args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	serv_send_attention(account->gc, c->name, YAHOO_BUZZ);
+	purple_prpl_send_attention(account->gc, c->name, YAHOO_BUZZ);
 
 	return PURPLE_CMD_RET_OK;
 }