pidgin: 182999b6: Fix compile errors from the merge. Untes...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 182999b6c59afcf63dda43bccb93e9db7c5f6719
Ancestor: 5aebbb01c9a3408a2dd4f9d94203330bcd9e6057
Author: qulogic at pidgin.im
Date: 2009-03-02T06:17:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/182999b6c59afcf63dda43bccb93e9db7c5f6719

Modified files:
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/toc/toc.c

ChangeLog: 

Fix compile errors from the merge. Untested protocols: msnp9, sametime,
silc, silc10, zephyr. Also, toc doesn't work either, but I don't know how
to fix it.

-------------- next part --------------
============================================================
--- libpurple/plugins/tcl/tcl_cmds.c	e901c4b22e586a403c86d99c7c1dce23e5884a1c
+++ libpurple/plugins/tcl/tcl_cmds.c	1e4f4533618dd612e7c64e10aa160ae52f29f01a
@@ -1495,9 +1495,12 @@ int tcl_cmd_status(ClientData unused, Tc
 	enum { CMD_STATUS_ATTR, CMD_STATUS_TYPE } cmd;
 	PurpleStatus *status;
 	PurpleStatusType *status_type;
+	int error;
+#if !(defined PURPLE_DISABLE_DEPRECATED)
 	PurpleValue *value;
 	const char *attr;
-	int error, v;
+	int v;
+#endif
 
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -1509,6 +1512,7 @@ int tcl_cmd_status(ClientData unused, Tc
 
 	switch (cmd) {
 	case CMD_STATUS_ATTR:
+#if !(defined PURPLE_DISABLE_DEPRECATED)
 		if (objc != 4 && objc != 5) {
 			Tcl_WrongNumArgs(interp, 2, objv, "status attr_id ?value?");
 			return TCL_ERROR;
@@ -1554,6 +1558,7 @@ int tcl_cmd_status(ClientData unused, Tc
                                          Tcl_NewStringObj("attribute has unknown type", -1));
 			return TCL_ERROR;
 		}
+#endif
 		break;
 	case CMD_STATUS_TYPE:
 		if (objc != 3) {
@@ -1727,6 +1732,7 @@ int tcl_cmd_status_type(ClientData unuse
 						  (purple_status_type_get_primitive(status_type)), -1));
 		break;
 	case CMD_STATUS_TYPE_PRIMARY_ATTR:
+#if !(defined PURPLE_DISABLE_DEPRECATED)
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
 			return TCL_ERROR;
@@ -1735,6 +1741,7 @@ int tcl_cmd_status_type(ClientData unuse
 			return TCL_ERROR;
 		Tcl_SetObjResult(interp,
 				 Tcl_NewStringObj(purple_status_type_get_primary_attr(status_type), -1));
+#endif
 		break;
 	case CMD_STATUS_TYPE_SAVEABLE:
 		if (objc != 3) {
============================================================
--- libpurple/protocols/oscar/family_icbm.c	56d7709d2dd31479802308de35116e0701db12a9
+++ libpurple/protocols/oscar/family_icbm.c	24c82a9fc79bf2f79be44735c72f2efd49e69c0f
@@ -1625,7 +1625,7 @@ static int incomingim_ch1(OscarData *od,
 
 			if (magic1 != 0x501)
 			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
+				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
 				break;
 			}
 
@@ -1654,7 +1654,7 @@ static int incomingim_ch1(OscarData *od,
 			magic1 = byte_stream_get16(bs); /* 01 01 */
 			if (magic1 != 0x101) /* Bad, message comes before attributes */
 			{
-				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
+				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->bn);
 				break;
 			}
 			msglen = byte_stream_get16(bs);
============================================================
--- libpurple/protocols/toc/toc.c	d24d45047c8636a0e4629c39a59d15b81d1ae5a1
+++ libpurple/protocols/toc/toc.c	c16de6df31fa2ff378411c8e8d948ce6495bcd22
@@ -119,7 +119,7 @@ struct signon {
 
 #define TOC_CONNECT_STEPS 3
 
-static void toc_login_callback(gpointer, gint, PurpleInputCondition);
+static void toc_login_callback(gpointer, gint, const gchar *);
 static void toc_callback(gpointer, gint, PurpleInputCondition);
 
 /* ok. this function used to take username/password, and return 0 on success.
@@ -152,7 +152,7 @@ static void toc_login(PurpleAccount *acc
 	}
 }
 
-static void toc_login_callback(gpointer data, gint source, PurpleInputCondition cond)
+static void toc_login_callback(gpointer data, gint source, const gchar *error_message)
 {
 	PurpleConnection *gc = data;
 	struct toc_data *tdt;
@@ -260,7 +260,8 @@ static void toc_build_config(PurpleAccou
 	}
 }
 
-char *escape_message(const char *msg)
+static char *
+escape_message(const char *msg)
 {
 	char *ret;
 	int i, j;
@@ -305,7 +306,8 @@ char *escape_message(const char *msg)
  * Duplicates the input string, replacing each \n with a <BR>, and 
  * escaping a few other characters.
  */
-char *escape_text(const char *msg)
+static char *
+escape_text(const char *msg)
 {
 	char *ret;
 	int i, j;
@@ -435,7 +437,7 @@ static int wait_reply(PurpleConnection *
 	if (buflen < ntohs(hdr->len)) {
 		/* fake like there's a read error */
 		purple_debug(PURPLE_DEBUG_ERROR, "toc",
-				   "buffer too small (have %d, need %d)\n",
+				   "buffer too small (have %" G_GSIZE_FORMAT ", need %d)\n",
 				   buflen, ntohs(hdr->len));
 		return -1;
 	}