diff libpurple/protocols/msn/msn.c @ 19714:43a8cd1f708c

Remove the *_USE_ATTENTION_API markers everywhere.
author Richard Laager <rlaager@wiktel.com>
date Mon, 10 Sep 2007 20:51:59 +0000
parents d3d9e3978d82
children e5b827037534
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Mon Sep 10 20:29:29 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Sep 10 20:51:59 2007 +0000
@@ -119,7 +119,6 @@
 	return TRUE;
 }
 
-#ifdef MSN_USE_ATTENTION_API
 static GList *
 msn_attention_types(PurpleAccount *account)
 {
@@ -136,7 +135,6 @@
 
 	return list;
 }
-#endif
 
 
 static PurpleCmdRet
@@ -148,14 +146,7 @@
 
 	username = purple_conversation_get_name(conv);
 
-#ifdef MSN_USE_ATTENTION_API
 	serv_send_attention(gc, username, MSN_NUDGE);
-#else
-	if (!msn_send_attention(gc, username, MSN_NUDGE))
-		return PURPLE_CMD_RET_FAILED;
-
-	purple_conversation_write(conv, NULL, _("You have just sent a Nudge!"), PURPLE_MESSAGE_SYSTEM, time(NULL));
-#endif
 
 	return PURPLE_CMD_RET_OK;
 }
@@ -2139,15 +2130,10 @@
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
 	NULL,					/* unregister_user */
-
-#ifdef MSN_USE_ATTENTION_API
 	msn_send_attention,                     /* send_attention */
 	msn_attention_types,                    /* attention_types */
-#else
+
 	/* padding */
-	NULL,
-	NULL,
-#endif
 	NULL
 };