pidgin: 4538cb49: Rename MSIM_BM_INSTANT_ACTION_OR_IM to M...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 4538cb494f592d4dc496f982c8c2a393294e499b
Ancestor: 2a5374e9da8693daa158c8138a3089870c4b135a
Author: markdoliner at pidgin.im
Date: 2009-06-23T05:40:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4538cb494f592d4dc496f982c8c2a393294e499b

Modified files:
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/zap.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/myspace.c	f749afe74600cf027c2cce8a1374132c04f481c4
+++ libpurple/protocols/myspace/myspace.c	986899a4d43cb054d941140e67f9d485430ec91c
@@ -1661,8 +1661,8 @@ msim_incoming_bm(MsimSession *session, M
 	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 @@ msim_send_im(PurpleConnection *gc, const
 
 	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 @@ msim_send_typing(PurpleConnection *gc, c
 	}
 
 	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;
 }
 
============================================================
--- libpurple/protocols/myspace/myspace.h	f5d70f6419e122ee2c24cee6e8a12db4efb1e971
+++ libpurple/protocols/myspace/myspace.h	70d12885861c2707390aa645dfe16c402218c29f
@@ -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
============================================================
--- libpurple/protocols/myspace/zap.c	d573d34b178d5b8b9471e71e12c6299d96861b7d
+++ libpurple/protocols/myspace/zap.c	619464474f8424bd70787c8d0040c58905051546
@@ -109,7 +109,7 @@ msim_send_zap(MsimSession *session, cons
 	/* 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);