diff libpurple/protocols/myspace/zap.c @ 19463:3f6f84d11ce2

Change serv_send_attention() to call prpl_info->send_attention(), and other minor improvements. Update msimprpl with attention changes.

--- a/libpurple/protocols/myspace/zap.c	Mon Aug 27 02:29:15 2007 +0000
+++ b/libpurple/protocols/myspace/zap.c	Mon Aug 27 05:37:40 2007 +0000
@@ -81,9 +81,7 @@
 		return FALSE;
 	}
 
-	/* TODO: make use of the MsimAttentionType we found, instead of
-	 * doing it all over in msim_send_zap_from_menu. */
-	msim_send_zap_from_menu(&buddy->node, GUINT_TO_POINTER(code));
+	msim_send_zap(session, username, code);
 
 	return TRUE;
 }
@@ -105,7 +103,7 @@
 
 
 #ifdef MSIM_USE_ATTENTION_API
-	serv_send_attention(session->gc, username, code);
+	/* serv_send_attention(session->gc, username, code); */
 #else
 	types = msim_attention_types(session->account);
 
@@ -167,7 +165,11 @@
 
 	zap = GPOINTER_TO_INT(zap_num_ptr);
 
+#ifdef MSIM_USE_ATTENTION_API
+	serv_send_attention(session->gc, buddy->name, zap);
+#else
 	g_return_if_fail(msim_send_zap(session, buddy->name, zap));
+#endif
 }
 
 /** Return menu, if any, for a buddy list node. */