# HG changeset patch
# User Jeffrey Connelly <jaconnel@calpoly.edu>
# Date 1181769940 0
# Node ID e9dfd3a5d4b6c558459f6611c489d45417c7de0e
# Parent  2aff11bb5e72a625b12562f637bd0c8c514e4a56
Remove msim_get_own_uid{,_cb}() - it is not needed, since the login
challenge response message sends our userid, which I save in MsimSession.
userid.

Change msim_remove_buddy() to send the user's userid in the uid field,
instead of a placeholder (status: not working).

diff -r 2aff11bb5e72 -r e9dfd3a5d4b6 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Wed Jun 13 21:21:48 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Wed Jun 13 21:25:40 2007 +0000
@@ -1440,7 +1440,7 @@
 			"cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_DELETE,
 			"dsn", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_DSN,
 			"lid", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_LID,
-			"uid", MSIM_TYPE_INTEGER, 42, /* TODO: put YOUR userid here */
+			"uid", MSIM_TYPE_INTEGER, session->userid,
 			"rid", MSIM_TYPE_INTEGER, session->next_rid++,
 			"body", MSIM_TYPE_STRING, g_strdup("ContactID=%d"),
 			NULL);
@@ -1609,32 +1609,6 @@
 	return rid;
 }
 
-/** Process reply to get our own userid. */
-void msim_get_own_uid_cb(MsimSession *session, MsimMessage *userinfo, gpointer data)
-{
-	/* TODO */
-	msim_msg_dump("msim_get_own_uid_cb: %s\n", userinfo);
-}
-
-/** Request our own userid. */
-void msim_get_own_uid(MsimSession *session)
-{
-	guint rid;
-
-	rid = msim_new_reply_callback(session, msim_get_own_uid_cb, NULL);
-    
-	g_return_if_fail(msim_send(session,
-			"persist", MSIM_TYPE_INTEGER, 1,
-			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
-			"cmd", MSIM_TYPE_INTEGER, 1,
-			"dsn", MSIM_TYPE_INTEGER, MG_OWN_MYSPACE_INFO_DSN,
-			"lid", MSIM_TYPE_INTEGER, MG_OWN_MYSPACE_INFO_LID,
-			"rid", MSIM_TYPE_INTEGER, rid,
-			"body", MSIM_TYPE_STRING, g_strdup(""),
-			NULL));
-} 
-
-
 /**
  * Callback when connected. Sets up input handlers.
  *
@@ -1717,7 +1691,6 @@
     session->magic = -1;
 
     g_free(session->rxbuf);
-    g_free(session->userid);
 
 	/* TODO: Remove. */
 	g_hash_table_destroy(session->user_lookup_cb);
@@ -1848,7 +1821,7 @@
 			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
 			"cmd", MSIM_TYPE_INTEGER, 1,
 			"dsn", MSIM_TYPE_INTEGER, dsn,
-			"uid", MSIM_TYPE_STRING, g_strdup(session->userid),
+			"uid", MSIM_TYPE_INTEGER, session->userid,
 			"lid", MSIM_TYPE_INTEGER, lid,
 			"rid", MSIM_TYPE_INTEGER, rid,
 			/* TODO: dictionary field type */
diff -r 2aff11bb5e72 -r e9dfd3a5d4b6 libpurple/protocols/myspace/myspace.h
--- a/libpurple/protocols/myspace/myspace.h	Wed Jun 13 21:21:48 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Wed Jun 13 21:25:40 2007 +0000
@@ -187,9 +187,6 @@
 
 guint msim_new_reply_callback(MsimSession *session, MSIM_USER_LOOKUP_CB cb, gpointer data);
 
-void msim_get_own_uid_cb(MsimSession *session, MsimMessage *userinfo, gpointer data);
-void msim_get_own_uid(MsimSession *session);
-
 void msim_connect_cb(gpointer data, gint source, 
 		const gchar *error_message);