Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 09:13:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix style issues

Browse Source
This commit is contained in:
jfreegman 2022-06-27 19:42:38 -04:00
parent 146b00b8ca
commit 058057c64d
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap.c
View File

@ -601,6 +601,7 @@ int load_DHT_nodeslist(void)
Nodes.count = 2; Nodes.count = 2;
#if 0 #if 0
if (thread_data.active) { if (thread_data.active) {
return -1; return -1;
} }
@ -623,6 +624,7 @@ int load_DHT_nodeslist(void)
thread_data.active = false; thread_data.active = false;
return -5; return -5;
} }
#endif #endif
return 0; return 0;

6
src/groupchats.c
View File

@ -991,7 +991,9 @@ static void groupchat_onGroupPeerJoin(ToxWindow *self, Tox *m, uint32_t groupnum
++chat->max_idx; ++chat->max_idx;
} }
if (timed_out(chat->time_connected, 60) && user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) { /* ignore join messages when we first connect to the group */ if (timed_out(chat->time_connected, 60)
&& user_settings->show_group_connection_msg ==
SHOW_GROUP_CONNECTION_MSG_ON) { /* ignore join messages when we first connect to the group */
line_info_add(self, true, peer->name, NULL, CONNECTION, 0, GREEN, "has joined the room"); line_info_add(self, true, peer->name, NULL, CONNECTION, 0, GREEN, "has joined the room");
write_to_log("has joined the room", peer->name, self->chatwin->log, true); write_to_log("has joined the room", peer->name, self->chatwin->log, true);
@ -1036,7 +1038,7 @@ void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, ui
if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) { if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {
write_to_log(log_str, name, self->chatwin->log, true); write_to_log(log_str, name, self->chatwin->log, true);
} }
sound_notify(self, silent, NT_WNDALERT_2, NULL); sound_notify(self, silent, NT_WNDALERT_2, NULL);
} }

9
src/toxic.c
View File

@ -269,13 +269,20 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
} }
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
struct tm tmp; struct tm tmp;
gmtime_r(&tv.tv_sec, &tmp); gmtime_r(&tv.tv_sec, &tmp);
char timestamp[200]; char timestamp[200];
strftime(timestamp, sizeof(timestamp), "%F %T", &tmp); strftime(timestamp, sizeof(timestamp), "%F %T", &tmp);
fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func, message); fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func,
message);
fflush(fp); fflush(fp);
} }