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

Remove overlooked merge leftovers

Browse source
This commit is contained in:
Matthias Jentsch 2014-09-10 16:20:34 +02:00 • committed by Matthias Jentsch
parent 1f7f768bb5
commit 703d6e9e2e
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
purple-plugin/telegram-purple.c
View file

@ -685,21 +685,9 @@ static int tgprpl_send_chat(PurpleConnection * gc, int id, const char *message,
//PurpleConversation *convo = purple_find_chat(gc, id);
do_send_message (conn->tg, MK_CHAT(id), message, strlen(message));
<<<<<<< HEAD
char *who = g_strdup_printf("%d", id);
serv_got_chat_in(gc, id, "You", PURPLE_MESSAGE_RECV, message, time(NULL));
g_free(who);
=======
peer_t *peer = user_chat_get(conn->tg->bl, MK_USER (conn->tg->our_id));
char *me = malloc(BUDDYNAME_MAX_LENGTH);
user_get_alias(peer, me, BUDDYNAME_MAX_LENGTH);
logprintf ("Current user: '%s'\n", me);
purple_conv_chat_write(PURPLE_CONV_CHAT(convo), me, message, PURPLE_MESSAGE_SEND, time(NULL));
tgprpl_has_output (conn->tg);
g_free(me);
>>>>>>> 95347fdee590c47fa850bbf2ef30b7b01d2ae3f6
return 1;
}
@ -926,12 +914,9 @@ static void tgprpl_chat_join(PurpleConnection * gc, GHashTable * data)
char *subject, *owner, *part;
do_get_chat_info (conn->tg, MK_CHAT(atoi(id)));
tgprpl_has_output (conn->tg);
<<<<<<< HEAD
} else {
logprintf ("chat already known\n");
serv_got_joined_chat(conn->gc, atoi(id), groupname);
=======
>>>>>>> 95347fdee590c47fa850bbf2ef30b7b01d2ae3f6
}
}