yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-03 01:39:16 +02:00
Code Issues Releases Wiki Activity

fix deltachat/deltachat-core-rust/issues/163

Browse source 
basically "back port" https://github.com/deltachat/deltachat-core-rust/pull/288
This commit is contained in:
Simon Laux 2019-08-04 09:28:15 +02:00 • committed by GitHub
parent 22536f233d
commit 1e1d1d4734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dc_chat.c
View file

@ -2206,9 +2206,10 @@ static int get_parent_mime_headers(const dc_chat_t* chat,
stmt = dc_sqlite3_prepare(chat->context->sql, stmt = dc_sqlite3_prepare(chat->context->sql,
"SELECT rfc724_mid, mime_in_reply_to, mime_references" "SELECT rfc724_mid, mime_in_reply_to, mime_references"
" FROM msgs" " FROM msgs"
" WHERE timestamp=(SELECT max(timestamp) FROM msgs WHERE chat_id=? AND from_id!=?);"); " WHERE chat_id=? AND timestamp=(SELECT max(timestamp) FROM msgs WHERE chat_id=? AND from_id!=?);");
sqlite3_bind_int (stmt, 1, chat->id); sqlite3_bind_int (stmt, 1, chat->id);
sqlite3_bind_int (stmt, 2, DC_CONTACT_ID_SELF); sqlite3_bind_int (stmt, 2, chat->id);
sqlite3_bind_int (stmt, 3, DC_CONTACT_ID_SELF);
if (sqlite3_step(stmt)==SQLITE_ROW) { if (sqlite3_step(stmt)==SQLITE_ROW) {
*parent_rfc724_mid = dc_strdup((const char*)sqlite3_column_text(stmt, 0)); *parent_rfc724_mid = dc_strdup((const char*)sqlite3_column_text(stmt, 0));
*parent_in_reply_to = dc_strdup((const char*)sqlite3_column_text(stmt, 1)); *parent_in_reply_to = dc_strdup((const char*)sqlite3_column_text(stmt, 1));
@ -2223,9 +2224,10 @@ static int get_parent_mime_headers(const dc_chat_t* chat,
stmt = dc_sqlite3_prepare(chat->context->sql, stmt = dc_sqlite3_prepare(chat->context->sql,
"SELECT rfc724_mid, mime_in_reply_to, mime_references" "SELECT rfc724_mid, mime_in_reply_to, mime_references"
" FROM msgs" " FROM msgs"
" WHERE timestamp=(SELECT min(timestamp) FROM msgs WHERE chat_id=? AND from_id==?);"); " WHERE chat_id=? AND timestamp=(SELECT min(timestamp) FROM msgs WHERE chat_id=? AND from_id==?);");
sqlite3_bind_int (stmt, 1, chat->id); sqlite3_bind_int (stmt, 1, chat->id);
sqlite3_bind_int (stmt, 2, DC_CONTACT_ID_SELF); sqlite3_bind_int (stmt, 2, chat->id);
sqlite3_bind_int (stmt, 3, DC_CONTACT_ID_SELF);
if (sqlite3_step(stmt)==SQLITE_ROW) { if (sqlite3_step(stmt)==SQLITE_ROW) {
*parent_rfc724_mid = dc_strdup((const char*)sqlite3_column_text(stmt, 0)); *parent_rfc724_mid = dc_strdup((const char*)sqlite3_column_text(stmt, 0));
*parent_in_reply_to = dc_strdup((const char*)sqlite3_column_text(stmt, 1)); *parent_in_reply_to = dc_strdup((const char*)sqlite3_column_text(stmt, 1));