comparison libpurple/protocols/msn/msn.c @ 19713: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
comparison
equal deleted inserted replaced
19712:eabc8a32b1e4 19713:43a8cd1f708c
117 msn_switchboard_send_msg(swboard, msg, TRUE); 117 msn_switchboard_send_msg(swboard, msg, TRUE);
118 118
119 return TRUE; 119 return TRUE;
120 } 120 }
121 121
122 #ifdef MSN_USE_ATTENTION_API
123 static GList * 122 static GList *
124 msn_attention_types(PurpleAccount *account) 123 msn_attention_types(PurpleAccount *account)
125 { 124 {
126 PurpleAttentionType *attn; 125 PurpleAttentionType *attn;
127 static GList *list = NULL; 126 static GList *list = NULL;
134 list = g_list_append(list, attn); 133 list = g_list_append(list, attn);
135 } 134 }
136 135
137 return list; 136 return list;
138 } 137 }
139 #endif
140 138
141 139
142 static PurpleCmdRet 140 static PurpleCmdRet
143 msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data) 141 msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data)
144 { 142 {
146 PurpleConnection *gc = purple_account_get_connection(account); 144 PurpleConnection *gc = purple_account_get_connection(account);
147 const gchar *username; 145 const gchar *username;
148 146
149 username = purple_conversation_get_name(conv); 147 username = purple_conversation_get_name(conv);
150 148
151 #ifdef MSN_USE_ATTENTION_API
152 serv_send_attention(gc, username, MSN_NUDGE); 149 serv_send_attention(gc, username, MSN_NUDGE);
153 #else
154 if (!msn_send_attention(gc, username, MSN_NUDGE))
155 return PURPLE_CMD_RET_FAILED;
156
157 purple_conversation_write(conv, NULL, _("You have just sent a Nudge!"), PURPLE_MESSAGE_SYSTEM, time(NULL));
158 #endif
159 150
160 return PURPLE_CMD_RET_OK; 151 return PURPLE_CMD_RET_OK;
161 } 152 }
162 153
163 static void 154 static void
2137 msn_offline_message, /* offline_message */ 2128 msn_offline_message, /* offline_message */
2138 NULL, /* whiteboard_prpl_ops */ 2129 NULL, /* whiteboard_prpl_ops */
2139 NULL, /* send_raw */ 2130 NULL, /* send_raw */
2140 NULL, /* roomlist_room_serialize */ 2131 NULL, /* roomlist_room_serialize */
2141 NULL, /* unregister_user */ 2132 NULL, /* unregister_user */
2142
2143 #ifdef MSN_USE_ATTENTION_API
2144 msn_send_attention, /* send_attention */ 2133 msn_send_attention, /* send_attention */
2145 msn_attention_types, /* attention_types */ 2134 msn_attention_types, /* attention_types */
2146 #else 2135
2147 /* padding */ 2136 /* padding */
2148 NULL,
2149 NULL,
2150 #endif
2151 NULL 2137 NULL
2152 }; 2138 };
2153 2139
2154 static PurplePluginInfo info = 2140 static PurplePluginInfo info =
2155 { 2141 {