From a360afe08ad58b84e2165ed499aaa6ce18ef3248 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Sun, 12 Apr 2015 21:56:42 -0400 Subject: [PATCH] remove group self-timeout callback --- src/groupchat.c | 21 --------------------- src/toxic.c | 1 - src/toxic.h | 1 - src/windows.c | 10 ---------- src/windows.h | 1 - 5 files changed, 34 deletions(-) diff --git a/src/groupchat.c b/src/groupchat.c index 93b2c66..d149aa2 100644 --- a/src/groupchat.c +++ b/src/groupchat.c @@ -533,26 +533,6 @@ static void groupchat_onGroupSelfJoin(ToxWindow *self, Tox *m, int groupnum) line_info_add(self, timefrmt, NULL, NULL, SYS_MSG, 1, MAGENTA, "-!- Topic set to: %s", topic); } -static void groupchat_onGroupSelfTimeout(ToxWindow *self, Tox *m, int groupnum) -{ - if (groupnum != self->num) - return; - - int i; - - for (i = 0; i < max_groupchat_index; ++i) { - if (groupchats[i].active && groupchats[i].groupnumber == groupnum) { - groupchats[i].is_connected = false; - break; - } - } - - char timefrmt[TIME_STR_SIZE]; - get_time_str(timefrmt, sizeof(timefrmt)); - - line_info_add(self, timefrmt, NULL, NULL, SYS_MSG, 0, RED, "-!- Disconnected from group"); -} - static void groupchat_onGroupRejected(ToxWindow *self, Tox *m, int groupnum, uint8_t type) { if (groupnum != self->num) @@ -967,7 +947,6 @@ ToxWindow new_group_chat(Tox *m, int groupnum, const char *groupname, int length ret.onGroupOpCertificate = &groupchat_onGroupOpCertificate; ret.onGroupNickChange = &groupchat_onGroupNickChange; ret.onGroupSelfJoin = &groupchat_onGroupSelfJoin; - ret.onGroupSelfTimeout = &groupchat_onGroupSelfTimeout; ret.onGroupRejected = &groupchat_onGroupRejected; ChatContext *chatwin = calloc(1, sizeof(ChatContext)); diff --git a/src/toxic.c b/src/toxic.c index bf19d2f..ab2a414 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -556,7 +556,6 @@ static void init_tox_callbacks(Tox *m) tox_callback_group_nick_change(m, on_group_nick_change, NULL); tox_callback_group_topic_change(m, on_group_topic_change, NULL); tox_callback_group_self_join(m, on_group_self_join, NULL); - tox_callback_group_self_timeout(m, on_group_self_timeout, NULL); tox_callback_group_rejected(m, on_group_rejected, NULL); } diff --git a/src/toxic.h b/src/toxic.h index 9a23908..2a7680a 100644 --- a/src/toxic.h +++ b/src/toxic.h @@ -127,6 +127,5 @@ void on_group_topic_change(Tox *m, int groupnumber, uint32_t peernumber, const u void on_group_nick_change(Tox *m, int groupnumber, uint32_t peernumber, const uint8_t *newname, uint16_t length, void *userdata); void on_group_op_certificate(Tox *m, int groupnumber, uint32_t src_peernum, uint32_t tgt_peernum, uint8_t cert_type, void *userdata); void on_group_self_join(Tox *m, int groupnumber, void *userdata); -void on_group_self_timeout(Tox *m, int groupnumber, void *userdata); void on_group_rejected(Tox *m, int groupnumber, uint8_t type, void *userdata); #endif /* #define TOXIC_H */ diff --git a/src/windows.c b/src/windows.c index 88154b0..9801a1a 100644 --- a/src/windows.c +++ b/src/windows.c @@ -293,16 +293,6 @@ void on_group_self_join(Tox *m, int groupnumber, void *userdata) } } -void on_group_self_timeout(Tox *m, int groupnumber, void *userdata) -{ - size_t i; - - for (i = 0; i < MAX_WINDOWS_NUM; ++i) { - if (windows[i].onGroupSelfTimeout != NULL) - windows[i].onGroupSelfTimeout(&windows[i], m, groupnumber); - } -} - void on_group_rejected(Tox *m, int groupnumber, uint8_t type, void *userdata) { size_t i; diff --git a/src/windows.h b/src/windows.h index ace1259..9bfa502 100644 --- a/src/windows.h +++ b/src/windows.h @@ -137,7 +137,6 @@ struct ToxWindow { void(*onGroupNickChange)(ToxWindow *, Tox *, int, uint32_t, const char *, uint16_t); void(*onGroupTopicChange)(ToxWindow *, Tox *, int, uint32_t, const char *, uint16_t); void(*onGroupSelfJoin)(ToxWindow *, Tox *, int); - void(*onGroupSelfTimeout)(ToxWindow *, Tox *, int); void(*onGroupRejected)(ToxWindow *, Tox *, int, uint8_t); #ifdef AUDIO