# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1245735634 0
# Node ID 5fbcfcbd65515097afb18c432fe01e5d445834b6
# Parent  14e7b8ecf9b370a97f3201c9701b32082c728d08
Rename MSIM_BM_INSTANT_ACTION_OR_IM to MSIM_BM_ACTION_OR_IM_INSTANT
and MSIM_BM_DELAYABLE_ACTION_OR_IM to MSIM_BM_ACTION_OR_IM_DELAYABLE

diff -r 14e7b8ecf9b3 -r 5fbcfcbd6551 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Tue Jun 23 05:35:14 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Jun 23 05:40:34 2009 +0000
@@ -1661,8 +1661,8 @@
 	switch (bm) {
 		case MSIM_BM_STATUS:
 			return msim_incoming_status(session, msg);
-		case MSIM_BM_INSTANT_ACTION_OR_IM:
-		case MSIM_BM_DELAYABLE_ACTION_OR_IM:
+		case MSIM_BM_ACTION_OR_IM_DELAYABLE:
+		case MSIM_BM_ACTION_OR_IM_INSTANT:
 			return msim_incoming_action_or_im(session, msg);
 		case MSIM_BM_MEDIA:
 			return msim_incoming_media(session, msg);
@@ -2287,7 +2287,7 @@
 
 	message_msim = html_to_msim_markup(session, message);
 
-	if (msim_send_bm(session, who, message_msim, MSIM_BM_DELAYABLE_ACTION_OR_IM)) {
+	if (msim_send_bm(session, who, message_msim, MSIM_BM_ACTION_OR_IM_DELAYABLE)) {
 		/* Return 1 to have Purple show this IM as being sent, 0 to not. I always
 		 * return 1 even if the message could not be sent, since I don't know if
 		 * it has failed yet--because the IM is only sent after the userid is
@@ -2340,7 +2340,7 @@
 	}
 
 	purple_debug_info("msim", "msim_send_typing(%s): %d (%s)\n", name, state, typing_str);
-	msim_send_bm(session, name, typing_str, MSIM_BM_INSTANT_ACTION_OR_IM);
+	msim_send_bm(session, name, typing_str, MSIM_BM_ACTION_OR_IM_INSTANT);
 	return 0;
 }
 
diff -r 14e7b8ecf9b3 -r 5fbcfcbd6551 libpurple/protocols/myspace/myspace.h
--- a/libpurple/protocols/myspace/myspace.h	Tue Jun 23 05:35:14 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Tue Jun 23 05:40:34 2009 +0000
@@ -127,9 +127,9 @@
 #define MSIM_FINAL_STRING           "\\final\\" /**< Message end marker */
 
 /* Messages */
-#define MSIM_BM_DELAYABLE_ACTION_OR_IM  1
+#define MSIM_BM_ACTION_OR_IM_DELAYABLE  1
 #define MSIM_BM_STATUS                  100
-#define MSIM_BM_INSTANT_ACTION_OR_IM    121
+#define MSIM_BM_ACTION_OR_IM_INSTANT    121
 #define MSIM_BM_MEDIA                   122
 #define MSIM_BM_PROFILE                 124
 #define MSIM_BM_UNOFFICIAL_CLIENT       200
diff -r 14e7b8ecf9b3 -r 5fbcfcbd6551 libpurple/protocols/myspace/zap.c
--- a/libpurple/protocols/myspace/zap.c	Tue Jun 23 05:35:14 2009 +0000
+++ b/libpurple/protocols/myspace/zap.c	Tue Jun 23 05:40:34 2009 +0000
@@ -109,7 +109,7 @@
 	/* Construct and send the actual zap command. */
 	zap_string = g_strdup_printf("!!!ZAP_SEND!!!=RTE_BTN_ZAPS_%d", code);
 
-	if (!msim_send_bm(session, username, zap_string, MSIM_BM_INSTANT_ACTION_OR_IM)) {
+	if (!msim_send_bm(session, username, zap_string, MSIM_BM_ACTION_OR_IM_INSTANT)) {
 		purple_debug_info("msim_send_zap",
 				"msim_send_bm failed: zapping %s with %s\n",
 				username, zap_string);