gobjectification: 369f97e0: Fix MSN compile.

qulogic at pidgin.im qulogic at pidgin.im
Sat Dec 13 22:18:59 EST 2008


-----------------------------------------------------------------
Revision: 369f97e036312867cf2179f317abe2255c0ba59d
Ancestor: c6a408f4d5f71ad3da71b39d9442b347fddf1f78
Author: qulogic at pidgin.im
Date: 2008-12-14T00:22:53
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/369f97e036312867cf2179f317abe2255c0ba59d

Modified files:
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c

ChangeLog: 

Fix MSN compile.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/httpconn.c	95775bac8ce400e3d4c8befd69789162ba9580ae
+++ libpurple/protocols/msn/httpconn.c	3cce1aa39dfb4ee77e5e7353c8b71c20b640b7db
@@ -279,7 +279,7 @@ read_cb(gpointer data, gint source, Purp
 	servconn = httpconn->servconn;
 
 	if (servconn->type == MSN_SERVCONN_NS)
-		servconn->session->account->gc->last_received = time(NULL);
+		purple_connection_received_now(purple_account_get_connection(servconn->session->account));
 
 	len = read(httpconn->fd, buf, sizeof(buf) - 1);
 	if (len < 0 && errno == EAGAIN)
============================================================
--- libpurple/protocols/msn/msn.c	d024862b2bd77f22397aa97b6a744b281cab5458
+++ libpurple/protocols/msn/msn.c	8211978bde1bfc7683f6eb7ac6f2b6ac9f61fe51
@@ -1006,7 +1006,7 @@ msn_login(PurpleAccount *account)
 
 	purple_object_set_protocol_data(PURPLE_OBJECT(gc),session);
 	purple_connection_turn_on_flags(gc,
-			PURPLE_CONNECTION_FLAGS_HTML | PURPLE_CONNECTION_FLAGS_FORMATTING_WBFO | PURPLE_CONNECTION_FLAGS_NO_BGCOLOR | PURPLE_CONNECTION_FLAGS_NO_FONTSIZE | PURPLE_CONNECTION_FLAGS_NO_URLDESC | PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY);
+			PURPLE_CONNECTION_FLAGS_HTML | PURPLE_CONNECTION_FLAGS_FORMATTING_WBFO | PURPLE_CONNECTION_FLAGS_NO_BGCOLOR | PURPLE_CONNECTION_FLAGS_NO_FONTSIZE | PURPLE_CONNECTION_FLAGS_NO_URLDESC | PURPLE_CONNECTION_FLAGS_ALLOW_CUSTOM_SMILEY);
 
 	msn_session_set_login_step(session, MSN_LOGIN_STEP_START);
 
============================================================
--- libpurple/protocols/msn/notification.c	700c32878a54297b1452b12cfa059090d82b67ab
+++ libpurple/protocols/msn/notification.c	728af74f1ba862904191d3e0d482936092748f7d
@@ -1421,7 +1421,7 @@ url_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	const char *rru;
 	const char *url;
 	PurpleCipher *cipher;
-	guchar creds[33];
+	gchar creds[33];
 	char *buf;
 
 	gulong tmp_timestamp;


More information about the Commits mailing list