changeset 17945:cf55077a3752

Remove MSIM_FAKE_SELF_ONLINE option, since our own status is actually updated (it wasn't apparent before msim_set_status was implemented, since without it, we would always appear as invisible (hidden) / offline). Clean up some old comments. The bug mentioned in the last commit message seems to be a Pidgin bug, but I can't reproduce it.
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Thu, 12 Jul 2007 04:15:45 +0000
parents c109b7f1c739
children b3e971b375b5
files libpurple/protocols/myspace/myspace.c libpurple/protocols/myspace/myspace.h
diffstat 2 files changed, 2 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c	Thu Jul 12 03:21:07 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Thu Jul 12 04:15:45 2007 +0000
@@ -867,12 +867,6 @@
 /** Convert an individual HTML tag to msim markup. */
 void html_tag_to_msim_markup(xmlnode *root, gchar **begin, gchar **end)
 {
-    /* TODO: TODO XXX */
-    /*
-    *begin = g_strdup_printf("[begin-%s]", root->name);
-    *end = g_strdup_printf("[end-%s]", root->name);
-    */
-
     /* TODO: Coalesce nested tags into one <f> tag!
      * Currently, the 's' value will be overwritten when b/i/u is nested
      * within another one, and only the inner-most formatting will be 
@@ -1336,8 +1330,7 @@
 	g_free(user_to_lookup); 
 }
 
-/** Set your status - callback for when user manually sets it. 
- * TODO: find out why when setting status with a message, it ALWAYS goes to away! */
+/** Set your status - callback for when user manually sets it.  */
 void
 msim_set_status(PurpleAccount *account, PurpleStatus *status)
 {
@@ -1692,12 +1685,6 @@
      * address and not username. Will be freed in msim_session_destroy(). */
     session->username = msim_msg_get_string(msg, "uniquenick");
 
-#ifdef MSIM_FAKE_SELF_ONLINE
-    purple_debug_info("msim", "msim_we_are_logged_on: faking self as coming online\n");
-    /* Fake our self coming online. TODO: do we need this anymore?! */
-    purple_prpl_got_user_status(session->account, session->username, 
-            purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE), NULL);
-#endif
 
     purple_debug_info("msim", "msim_we_are_logged_on: notifying servers of status\n");
     /* Notify servers of our current status. */
@@ -2043,16 +2030,7 @@
 				purple_status_code = PURPLE_STATUS_AVAILABLE;
 	}
 
-#ifdef MSIM_FAKE_SELF_ONLINE
-	if (!strcmp(username, session->username) && purple_status_code == PURPLE_STATUS_OFFLINE)
-	{
-		/* Hack to ignore offline status notices on self. */
-	} else if (status_code != MSIM_STATUS_CODE_IDLE) {
-#endif
-		purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL);
-#ifdef MSIM_FAKE_SELF_ONLINE
-	}
-#endif
+    purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL);
 
     if (status_code == MSIM_STATUS_CODE_IDLE)
     {
--- a/libpurple/protocols/myspace/myspace.h	Thu Jul 12 03:21:07 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Thu Jul 12 04:15:45 2007 +0000
@@ -64,14 +64,6 @@
  * you want to actually use the plugin! */
 /*#define MSIM_SELF_TEST				*/
 
-/* Define to fake our own user account always being online. Needed
- * because msim doesn't allow adding oneself to ones list. */
-#define MSIM_FAKE_SELF_ONLINE
-
-/* TODO: (one release after) when RC4 makes it into libpurple, use the PURPLE_VERSION_CHECK 
- * macro to conditionally compile. And then later, get rid of our own
- * RC4 code and only support libpurple with RC4. */
-
 /* Constants */
 
 /* Maximum length of a password that is acceptable. This is the limit