Merge branch 'master' of github.com:profanity-im/profanity

This commit is contained in:
Michael Vetter
2020-07-04 17:41:56 +02:00

View File

@@ -395,6 +395,7 @@ omemo_start_sessions(void)
void void
omemo_start_session(const char *const barejid) omemo_start_session(const char *const barejid)
{ {
if( omemo_loaded() ) {
log_info("OMEMO: start session with %s", barejid); log_info("OMEMO: start session with %s", barejid);
GList *device_list = g_hash_table_lookup(omemo_ctx.device_list, barejid); GList *device_list = g_hash_table_lookup(omemo_ctx.device_list, barejid);
if (!device_list) { if (!device_list) {
@@ -409,6 +410,7 @@ omemo_start_session(const char *const barejid)
omemo_bundle_request(barejid, GPOINTER_TO_INT(device_id->data), omemo_start_device_session_handle_bundle, free, strdup(barejid)); omemo_bundle_request(barejid, GPOINTER_TO_INT(device_id->data), omemo_start_device_session_handle_bundle, free, strdup(barejid));
} }
} }
}
void void
omemo_start_muc_sessions(const char *const roomjid) omemo_start_muc_sessions(const char *const roomjid)