diff libpurple/prpl.c @ 29312:163f6c3cbdd9

Remove purple_conversation_attention (also let prpl_send_attention handle the signalling)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 16 Nov 2009 21:04:49 +0000
parents ad119b77f941
children 7b1cfd48beab
line wrap: on
line diff
--- a/libpurple/prpl.c	Mon Nov 16 20:49:04 2009 +0000
+++ b/libpurple/prpl.c	Mon Nov 16 21:04:49 2009 +0000
@@ -407,6 +407,16 @@
 	return statuses;
 }
 
+static void
+purple_prpl_attention(PurpleConversation *conv, const char *who,
+	guint type, PurpleMessageFlags flags, time_t mtime)
+{
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	purple_signal_emit(purple_conversations_get_handle(),
+		flags == PURPLE_MESSAGE_SEND ? "sent-attention" : "got-attention",
+		account, who, conv, type);
+}
+
 void
 purple_prpl_send_attention(PurpleConnection *gc, const char *who, guint type_code)
 {
@@ -452,6 +462,7 @@
 
 	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, gc->account, who);
 	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, description, flags, mtime);
+	purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_SEND, time(NULL));
 
 	g_free(description);
 }
@@ -510,7 +521,7 @@
 	conv = 
 		purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, account);
 	if (conv)
-		purple_conversation_attention(conv, who, type_code, PURPLE_MESSAGE_RECV,
+		purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_RECV,
 			time(NULL));
 }