pidgin3: comparison libpurple/protocols/myspace/myspace.c

-:c903259e0c83
+:619ec16f2e6d
 {
 purple_debug_info("msim",
 "msim_check_inbox_cb: notifying of %d\n", n);
 /* TODO: free strings with callback _if_ change to dynamic (w/ token) */
-purple_notify_emails(session->account,
+purple_notify_emails(session->gc,       /* handle */
-n, TRUE, subjects, froms, tos, urls, NULL, NULL);
+n,                              /* count */
+TRUE,                           /* detailed */
+subjects, froms, tos, urls,
+NULL,       /* PurpleNotifyCloseCallback cb */
+NULL);      /* gpointer user_data */
 }
 g_hash_table_destroy(body);
 }
 */
 static MsimMessage *
 msim_do_postprocessing(MsimMessage *msg, const gchar *uid_before,
 		const gchar *uid_field_name, guint uid)
 {
-	purple_debug_info("msim", "msim_do_postprocessing called with ufn=%s, ub=%s, uid=%d\n",
-			uid_field_name, uid_before, uid);
 	msim_msg_dump("msim_do_postprocessing msg: %s\n", msg);
 	/* First, check - if the field already exists, treat it as a format string. */
 	if (msim_msg_get(msg, uid_field_name))
 	{
 * @param msg Message to postprocess. Will NOT be freed.
 * @param username Username to resolve. Assumed to be a static string (will not be freed or copied).
 * @param uid_field_name Name of new field to add, containing uid of username. Static string.
 * @param uid_before Name of existing field to insert username field before. Static string.
 *
-* @return Postprocessed message.
+* @return TRUE if successful.
 */
 gboolean
 msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg,
 		const gchar *username, const gchar *uid_field_name,
 		const gchar *uid_before)
 {
 PurpleBuddy *buddy;
 	guint uid;
 	gboolean rc;
+g_return_val_if_fail(msg != NULL, FALSE);
 	/* Store information for msim_postprocess_outgoing_cb(). */
-	purple_debug_info("msim", "msim_postprocess_outgoing(u=%s,ufn=%s,ub=%s)\n",
-			username, uid_field_name, uid_before);
 	msim_msg_dump("msim_postprocess_outgoing: msg before=%s\n", msg);
 	msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username));
 	msg = msim_msg_append(msg, "_uid_field_name", MSIM_TYPE_STRING, g_strdup(uid_field_name));
 	msg = msim_msg_append(msg, "_uid_before", MSIM_TYPE_STRING, g_strdup(uid_before));
 	delbuddy_msg = msim_msg_new(TRUE,
 				"delbuddy", MSIM_TYPE_BOOLEAN, TRUE,
 				"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
 				/* 'delprofileid' with uid will be inserted here. */
 				NULL);
-	/* TODO: free msg */
 	if (!msim_postprocess_outgoing(session, delbuddy_msg, buddy->name, "delprofileid", NULL))
 	{
 		purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("'delbuddy' command failed"));
+msim_msg_free(delbuddy_msg);
 		return;
 	}
+msim_msg_free(delbuddy_msg);
 	persist_msg = msim_msg_new(TRUE,
 			"persist", MSIM_TYPE_INTEGER, 1,
 			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
 			"cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_DELETE,
 			"rid", MSIM_TYPE_INTEGER, session->next_rid++,
 			/* <uid> will be replaced by postprocessing */
 			"body", MSIM_TYPE_STRING, g_strdup("ContactID=<uid>"),
 			NULL);
-	/* TODO: free msg */
 	if (!msim_postprocess_outgoing(session, persist_msg, buddy->name, "body", NULL))
 	{
 		purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("persist command failed"));
+msim_msg_free(persist_msg);
 		return;
 	}
+msim_msg_free(persist_msg);
 	blocklist_msg = msim_msg_new(TRUE,
 			"blocklist", MSIM_TYPE_BOOLEAN, TRUE,
 			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
 			/* TODO: MsimMessage lists */
 			NULL);
 	if (!msim_postprocess_outgoing(session, blocklist_msg, buddy->name, "idlist", NULL))
 	{
 		purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("blocklist command failed"));
+msim_msg_free(blocklist_msg);
 		return;
 	}
+msim_msg_free(blocklist_msg);
 }
 /** Return whether the buddy can be messaged while offline.
 *
 * The protocol supports offline messages in just the same way as online
 if (n + session->rxoff >= MSIM_READ_BUF_SIZE)
 {
 purple_debug_info("msim_input_cb", "received %d bytes, pushing rxoff to %d, over buffer size of %d\n",
 n, n + session->rxoff, MSIM_READ_BUF_SIZE);
+/* TODO: g_realloc like msn, yahoo, irc, jabber? */
 purple_connection_error(gc, _("Read buffer full"));
 }
 /* Null terminate */
 purple_debug_info("msim", "msim_input_cb: going to null terminate "

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/myspace/myspace.c

libpurple/protocols/myspace/myspace.c