comparison libpurple/protocols/msn/msn.c @ 20515:7aaebdb013c9

explicit merge of '496506f552dcc01dcc38820f472dc9d27a82a997' and '20899a5772594c6139b37b372cfab97e03cfa2ac'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:05:12 +0000
parents 723b5a2f91ce d3d9e3978d82
children 5bc492d82ff4
comparison
equal deleted inserted replaced
20514:723b5a2f91ce 20515:7aaebdb013c9
127 static GList *list = NULL; 127 static GList *list = NULL;
128 128
129 if (!list) { 129 if (!list) {
130 attn = g_new0(PurpleAttentionType, 1); 130 attn = g_new0(PurpleAttentionType, 1);
131 attn->name = _("nudge"); 131 attn->name = _("nudge");
132 attn->incoming_description = _("nudged"); 132 attn->incoming_description = _("%s has nudged you!");
133 attn->outgoing_description = _("Nudging"); 133 attn->outgoing_description = _("Nudging %s...");
134 list = g_list_append(list, attn); 134 list = g_list_append(list, attn);
135 } 135 }
136 136
137 return list; 137 return list;
138 } 138 }
2255 msn_new_xfer, /* new_xfer */ 2255 msn_new_xfer, /* new_xfer */
2256 msn_offline_message, /* offline_message */ 2256 msn_offline_message, /* offline_message */
2257 NULL, /* whiteboard_prpl_ops */ 2257 NULL, /* whiteboard_prpl_ops */
2258 NULL, /* send_raw */ 2258 NULL, /* send_raw */
2259 NULL, /* roomlist_room_serialize */ 2259 NULL, /* roomlist_room_serialize */
2260 NULL, /* unregister_user */
2260 2261
2261 #ifdef MSN_USE_ATTENTION_API 2262 #ifdef MSN_USE_ATTENTION_API
2262 msn_send_attention, /* send_attention */ 2263 msn_send_attention, /* send_attention */
2263 msn_attention_types, /* attention_types */ 2264 msn_attention_types, /* attention_types */
2264 #else 2265 #else
2265 /* padding */ 2266 /* padding */
2266 NULL, 2267 NULL,
2267 NULL, 2268 NULL,
2268 #endif 2269 #endif
2269 NULL,
2270 NULL 2270 NULL
2271 }; 2271 };
2272 2272
2273 static PurplePluginInfo info = 2273 static PurplePluginInfo info =
2274 { 2274 {