From 703d6e9e2e4c6cce58126151972cd01137a78b48 Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 10 Sep 2014 16:20:34 +0200 Subject: [PATCH] Remove overlooked merge leftovers --- purple-plugin/telegram-purple.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/purple-plugin/telegram-purple.c b/purple-plugin/telegram-purple.c index f1100a9..887a778 100644 --- a/purple-plugin/telegram-purple.c +++ b/purple-plugin/telegram-purple.c @@ -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 } }