stv0g/telegram-purple
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clean up inconsitencies in prpl tgl data type wrapper functions

Browse source
This commit is contained in:
mjentsch 2015-03-20 17:45:21 +01:00
parent f98ec356ba
commit 0664c5b2fe
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
telegram-purple.c
View file

@ -255,10 +255,8 @@ static void update_marked_read (struct tgl_state *TLS, int num, struct tgl_messa
PurpleConversation *conv = p2tgl_find_conversation_with_account (TLS, to_id);
if (conv) {
conv = p2tgl_conversation_new (TLS, to_id);
gchar *who = p2tgl_strdup_id (to_id);
purple_conversation_write (conv, who, "Messages marked as read.",
PURPLE_MESSAGE_NO_LOG | PURPLE_MESSAGE_SYSTEM, time (NULL));
g_free (who);
p2tgl_conversation_write (conv, to_id, "Messages marked as read.",
PURPLE_MESSAGE_NO_LOG | PURPLE_MESSAGE_SYSTEM, (int)time (NULL));
}
}
}

15
tgp-2prpl.c
View file

@ -127,7 +127,7 @@ void p2tgl_got_im_combo (struct tgl_state *TLS, tgl_peer_id_t who, const char *m
/*
Outgoing messages are not well supported in different libpurple clients,
p2tgl_conversation_write should have the best among different versions. Unfortunately
p2tgl_conv_im_write should have the best among different versions. Unfortunately
this causes buggy formatting in Adium, so we don't use this workaround in that case.
NOTE: Outgoing messages will not work in Adium <= 1.6.0, there is no way to print outgoing
@ -139,7 +139,7 @@ void p2tgl_got_im_combo (struct tgl_state *TLS, tgl_peer_id_t who, const char *m
if (!conv) {
conv = p2tgl_conversation_new(TLS, who);
}
p2tgl_conversation_write (conv, who, msg, PURPLE_MESSAGE_SEND, when);
p2tgl_conv_im_write (conv, who, msg, PURPLE_MESSAGE_SEND, when);
return;
}
#endif
@ -182,12 +182,19 @@ PurpleConversation *p2tgl_find_conversation_with_account (struct tgl_state *TLS,
void p2tgl_conversation_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
char *name = p2tgl_strdup_id (who);
purple_conv_im_write(purple_conversation_get_im_data(conv), name, message, flags, date);
// purple_conversation_write (conv, name, message, flags, date);
purple_conversation_write (conv, name, message, flags, date);
g_free (name);
}
void p2tgl_conv_im_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
char *name = p2tgl_strdup_id (who);
purple_conv_im_write(purple_conversation_get_im_data(conv), name, message, flags, date);
g_free (name);
}
PurpleConversation *p2tgl_conversation_new (struct tgl_state *TLS, tgl_peer_id_t who) {
int type = tgl_get_peer_type (who) == TGL_PEER_CHAT ? PURPLE_CONV_TYPE_CHAT : PURPLE_CONV_TYPE_IM;