Fix retrieval threshold unlimited

This commit is contained in:
mjentsch 2015-03-28 12:22:19 +01:00
parent 13cf093ab1
commit 1573309875
2 changed files with 4 additions and 5 deletions

View file

@ -354,8 +354,9 @@ static void tgp_msg_display (struct tgl_state *TLS, struct tgp_msg_loading *C) {
static time_t tgp_msg_oldest_relevant_ts (struct tgl_state *TLS) {
connection_data *conn = TLS->ev_base;
return tgp_time_n_days_ago (purple_account_get_int (conn->pa, "history-retrieve-days",
TGP_DEFAULT_HISTORY_RETRIEVAL_THRESHOLD));
int days = purple_account_get_int (conn->pa, TGP_KEY_HISTORY_RETRIEVAL_THRESHOLD,
TGP_DEFAULT_HISTORY_RETRIEVAL_THRESHOLD);
return days > 0 ? tgp_time_n_days_ago (days) : 0;
}
static void tgp_msg_process_ready (struct tgl_state *TLS)

View file

@ -91,9 +91,7 @@ tgl_peer_t *tgp_encr_chat_get_partner (struct tgl_state *TLS, struct tgl_secret_
}
long tgp_time_n_days_ago (int days) {
time_t now;
time (&now);
return now - 24 * 3600 * (time_t)days;
return time(NULL) - 24 * 3600 * days;
};
char *tgp_g_format_size (gint64 size) {