revert: restore pre-upstream-merge baseline (tree of 3b673150b)
All checks were successful
CI Code / Check spelling (pull_request) Successful in 18s
CI Code / Check coding style (pull_request) Successful in 30s
CI Code / Linux (ubuntu) (pull_request) Successful in 4m51s
CI Code / Linux (debian) (pull_request) Successful in 6m59s
CI Code / Linux (arch) (pull_request) Successful in 10m12s
CI Code / Code Coverage (pull_request) Successful in 6m44s

Roll the tree back to the pre-merge tip 3b673150b, undoing the upstream sync merge 72f4f186d (303 files) and the 13 post-merge commits layered on top of it.

Purpose: restore the last pre-sync baseline so the reported OMEMO/OTR encryption regressions can be reproduced against a known-good state and the upstream sync ruled in or out as the cause. Nothing is dropped from history; the merge and every post-merge commit remain reachable and can be cherry-picked back selectively.

Baseline:     3b673150b chore(chatlog): disable background message file logging (stage 1)

Undoes merge: 72f4f186d merge: sync upstream profanity-im/profanity
This commit is contained in:
2026-06-29 12:17:01 +03:00
parent ca92d29179
commit f9e184eda7
311 changed files with 9908 additions and 11285 deletions

View File

@@ -1,11 +1,3 @@
/*
* stub_gpg.c
*
* Copyright (C) 2015 - 2017 James Booth <boothj5@gmail.com>
* Copyright (C) 2020 - 2026 Michael Vetter <jubalh@iodoru.org>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#include <glib.h>
#include "pgp/gpg.h"
@@ -34,35 +26,35 @@ p_gpg_libver(void)
}
void
p_gpg_verify(const gchar* const barejid, const gchar* const sign)
p_gpg_verify(const char* const barejid, const char* const sign)
{
}
gchar*
p_gpg_sign(const gchar* const str, const gchar* const fp)
char*
p_gpg_sign(const char* const str, const char* const fp)
{
return NULL;
}
gboolean
p_gpg_valid_key(const gchar* const keyid, gchar** err_str)
p_gpg_valid_key(const char* const keyid, char** err_str)
{
return FALSE;
}
gboolean
p_gpg_available(const gchar* const barejid)
p_gpg_available(const char* const barejid)
{
return FALSE;
}
gchar*
p_gpg_decrypt(const gchar* const cipher)
char*
p_gpg_decrypt(const char* const cipher)
{
return NULL;
}
void
p_gpg_on_connect(const gchar* const barejid)
p_gpg_on_connect(const char* const barejid)
{
}
void
@@ -71,13 +63,13 @@ p_gpg_on_disconnect(void)
}
gboolean
p_gpg_addkey(const gchar* const jid, const gchar* const keyid)
p_gpg_addkey(const char* const jid, const char* const keyid)
{
return TRUE;
}
void
p_gpg_free_decrypted(gchar* decrypted)
p_gpg_free_decrypted(char* decrypted)
{
}
@@ -91,32 +83,32 @@ p_gpg_autocomplete_key_reset(void)
{
}
gchar*
p_gpg_autocomplete_key(const gchar* const search_str, gboolean previous, void* context)
char*
p_gpg_autocomplete_key(const char* const search_str, gboolean previous, void* context)
{
return NULL;
}
gchar*
p_gpg_format_fp_str(gchar* fp)
char*
p_gpg_format_fp_str(char* fp)
{
return NULL;
}
gchar*
p_gpg_get_pubkey(const gchar* const keyid)
char*
p_gpg_get_pubkey(const char* const keyid)
{
return NULL;
}
gboolean
p_gpg_is_public_key_format(const gchar* buffer)
p_gpg_is_public_key_format(const char* buffer)
{
return TRUE;
}
ProfPGPKey*
p_gpg_import_pubkey(const gchar* buffer)
p_gpg_import_pubkey(const char* buffer)
{
return NULL;
}