revert: restore pre-upstream-merge baseline (tree of 3b673150b)

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

src/plugins/plugins.c

@@ -4,7 +4,33 @@
  *
  * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
  *
- * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two.
+ *
+ * You must obey the GNU General Public License in all respects for all of the
+ * code used other than OpenSSL. If you modify file(s) with this exception, you
+ * may extend this exception to your version of the file(s), but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version. If you delete this exception statement from all
+ * source files in the program, then also delete it here.
+ *
  */
 
 #include <string.h>
@@ -82,7 +108,7 @@ void
 plugins_init(void)
 {
     prof_add_shutdown_routine(_plugins_shutdown);
-    plugins = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+    plugins = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL);
     callbacks_init();
     autocompleters_init();
     plugin_themes_init();
@@ -100,14 +126,14 @@ plugins_init(void)
     if (!plugins_pref) {
         return;
     }
-    for (guint i = 0; i < g_strv_length(plugins_pref); i++) {
+    for (int i = 0; i < g_strv_length(plugins_pref); i++) {
         gboolean loaded = FALSE;
         gchar* filename = plugins_pref[i];
 #ifdef HAVE_PYTHON
         if (g_str_has_suffix(filename, ".py")) {
             ProfPlugin* plugin = python_plugin_create(filename);
             if (plugin) {
-                g_hash_table_insert(plugins, g_strdup(filename), plugin);
+                g_hash_table_insert(plugins, strdup(filename), plugin);
                 loaded = TRUE;
             }
         }
@@ -116,7 +142,7 @@ plugins_init(void)
         if (g_str_has_suffix(filename, ".so")) {
             ProfPlugin* plugin = c_plugin_create(filename);
             if (plugin) {
-                g_hash_table_insert(plugins, g_strdup(filename), plugin);
+                g_hash_table_insert(plugins, strdup(filename), plugin);
                 loaded = TRUE;
             }
         }
@@ -145,14 +171,14 @@ plugins_free_install_result(PluginsInstallResult* result)
     if (!result) {
         return;
     }
-    g_slist_free_full(result->installed, g_free);
-    g_slist_free_full(result->failed, g_free);
+    g_slist_free_full(result->installed, free);
+    g_slist_free_full(result->failed, free);
 }
 
 PluginsInstallResult*
 plugins_install_all(const char* const path)
 {
-    PluginsInstallResult* result = g_new0(PluginsInstallResult, 1);
+    PluginsInstallResult* result = malloc(sizeof(PluginsInstallResult));
     result->installed = NULL;
     result->failed = NULL;
     GSList* contents = NULL;
@@ -165,9 +191,9 @@ plugins_install_all(const char* const path)
         if (g_str_has_suffix(curr->data, ".py") || g_str_has_suffix(curr->data, ".so")) {
             gchar* plugin_name = g_path_get_basename(curr->data);
             if (plugins_install(plugin_name, curr->data, error_message)) {
-                result->installed = g_slist_append(result->installed, g_strdup(curr->data));
+                result->installed = g_slist_append(result->installed, strdup(curr->data));
             } else {
-                result->failed = g_slist_append(result->failed, g_strdup(curr->data));
+                result->failed = g_slist_append(result->failed, strdup(curr->data));
             }
         }
         curr = g_slist_next(curr);
@@ -188,8 +214,10 @@ plugins_uninstall(const char* const plugin_name)
     g_string_append(target_path, "/");
     g_string_append(target_path, plugin_name);
     GFile* file = g_file_new_for_path(target_path->str);
-    gboolean result = g_file_delete(file, NULL, NULL);
+    GError* error = NULL;
+    gboolean result = g_file_delete(file, NULL, &error);
     g_object_unref(file);
+    g_error_free(error);
     g_string_free(target_path, TRUE);
     return result;
 }
@@ -227,7 +255,7 @@ plugins_load_all(void)
     while (curr) {
         error_message = g_string_new(NULL);
         if (plugins_load(curr->data, error_message)) {
-            loaded = g_slist_append(loaded, g_strdup(curr->data));
+            loaded = g_slist_append(loaded, strdup(curr->data));
         }
         curr = g_slist_next(curr);
         g_string_free(error_message, TRUE);
@@ -262,7 +290,7 @@ plugins_load(const char* const name, GString* error_message)
 #endif
     }
     if (plugin) {
-        g_hash_table_insert(plugins, g_strdup(name), plugin);
+        g_hash_table_insert(plugins, strdup(name), plugin);
         if (connection_get_status() == JABBER_CONNECTED) {
             plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, session_get_account_name(), connection_get_fulljid());
         } else {
@@ -285,7 +313,7 @@ plugins_unload_all(void)
     GList* plugin_names_dup = NULL;
     GList* curr = plugin_names;
     while (curr) {
-        plugin_names_dup = g_list_append(plugin_names_dup, g_strdup(curr->data));
+        plugin_names_dup = g_list_append(plugin_names_dup, strdup(curr->data));
         curr = g_list_next(curr);
     }
     g_list_free(plugin_names);
@@ -298,7 +326,7 @@ plugins_unload_all(void)
         curr = g_list_next(curr);
     }
 
-    g_list_free_full(plugin_names_dup, g_free);
+    g_list_free_full(plugin_names_dup, free);
 
     return result;
 }
@@ -340,7 +368,7 @@ plugins_reload_all(void)
     GList* plugin_names_dup = NULL;
     GList* curr = plugin_names;
     while (curr) {
-        plugin_names_dup = g_list_append(plugin_names_dup, g_strdup(curr->data));
+        plugin_names_dup = g_list_append(plugin_names_dup, strdup(curr->data));
         curr = g_list_next(curr);
     }
     g_list_free(plugin_names);
@@ -354,7 +382,7 @@ plugins_reload_all(void)
         curr = g_list_next(curr);
     }
 
-    g_list_free_full(plugin_names_dup, g_free);
+    g_list_free_full(plugin_names_dup, free);
 }
 
 gboolean
@@ -383,7 +411,7 @@ _plugins_unloaded_list_dir(const gchar* const dir, GSList** result)
     while (plugin) {
         ProfPlugin* found = g_hash_table_lookup(plugins, plugin);
         if ((g_str_has_suffix(plugin, ".so") || g_str_has_suffix(plugin, ".py")) && !found) {
-            *result = g_slist_append(*result, g_strdup(plugin));
+            *result = g_slist_append(*result, strdup(plugin));
         }
         plugin = g_dir_read_name(plugins_dir);
     }
@@ -494,15 +522,15 @@ plugins_pre_chat_message_display(const char* const barejid, const char* const re
         return NULL;
     }
 
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_message = plugin->pre_chat_message_display(plugin, barejid, resource, curr_message);
         if (new_message) {
-            g_free(curr_message);
+            free(curr_message);
             curr_message = new_message;
         }
         curr = g_list_next(curr);
@@ -533,15 +561,15 @@ plugins_pre_chat_message_send(const char* const barejid, const char* message)
         return NULL;
     }
 
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         if (plugin->contains_hook(plugin, "prof_pre_chat_message_send")) {
             new_message = plugin->pre_chat_message_send(plugin, barejid, curr_message);
-            g_free(curr_message);
+            free(curr_message);
             if (new_message) {
                 curr_message = new_message;
             } else {
@@ -578,15 +606,15 @@ plugins_pre_room_message_display(const char* const barejid, const char* const ni
         return NULL;
     }
 
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_message = plugin->pre_room_message_display(plugin, barejid, nick, curr_message);
         if (new_message) {
-            g_free(curr_message);
+            free(curr_message);
             curr_message = new_message;
         }
         curr = g_list_next(curr);
@@ -617,15 +645,15 @@ plugins_pre_room_message_send(const char* const barejid, const char* message)
         return NULL;
     }
 
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         if (plugin->contains_hook(plugin, "prof_pre_room_message_send")) {
             new_message = plugin->pre_room_message_send(plugin, barejid, curr_message);
-            g_free(curr_message);
+            free(curr_message);
             if (new_message) {
                 curr_message = new_message;
             } else {
@@ -674,7 +702,7 @@ plugins_on_room_history_message(const char* const barejid, const char* const nic
     }
     g_list_free(values);
 
-    g_free(timestamp_str);
+    free(timestamp_str);
 }
 
 char*
@@ -686,15 +714,15 @@ plugins_pre_priv_message_display(const char* const fulljid, const char* message)
     }
 
     auto_jid Jid* jidp = jid_create(fulljid);
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_message = plugin->pre_priv_message_display(plugin, jidp->barejid, jidp->resourcepart, curr_message);
         if (new_message) {
-            g_free(curr_message);
+            free(curr_message);
             curr_message = new_message;
         }
         curr = g_list_next(curr);
@@ -727,15 +755,15 @@ plugins_pre_priv_message_send(const char* const fulljid, const char* const messa
     }
 
     auto_jid Jid* jidp = jid_create(fulljid);
-    gchar* new_message = NULL;
-    gchar* curr_message = g_strdup(message);
+    char* new_message = NULL;
+    char* curr_message = strdup(message);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         if (plugin->contains_hook(plugin, "prof_pre_priv_message_send")) {
             new_message = plugin->pre_priv_message_send(plugin, jidp->barejid, jidp->resourcepart, curr_message);
-            g_free(curr_message);
+            free(curr_message);
             if (new_message) {
                 curr_message = new_message;
             } else {
@@ -775,15 +803,15 @@ plugins_on_message_stanza_send(const char* const text)
         return NULL;
     }
 
-    gchar* new_stanza = NULL;
-    gchar* curr_stanza = g_strdup(text);
+    char* new_stanza = NULL;
+    char* curr_stanza = strdup(text);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_stanza = plugin->on_message_stanza_send(plugin, curr_stanza);
         if (new_stanza) {
-            g_free(curr_stanza);
+            free(curr_stanza);
             curr_stanza = new_stanza;
         }
         curr = g_list_next(curr);
@@ -821,15 +849,15 @@ plugins_on_presence_stanza_send(const char* const text)
         return NULL;
     }
 
-    gchar* new_stanza = NULL;
-    gchar* curr_stanza = g_strdup(text);
+    char* new_stanza = NULL;
+    char* curr_stanza = strdup(text);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_stanza = plugin->on_presence_stanza_send(plugin, curr_stanza);
         if (new_stanza) {
-            g_free(curr_stanza);
+            free(curr_stanza);
             curr_stanza = new_stanza;
         }
         curr = g_list_next(curr);
@@ -868,14 +896,14 @@ plugins_on_iq_stanza_send(const char* const text)
     }
 
     char* new_stanza = NULL;
-    char* curr_stanza = g_strdup(text);
+    char* curr_stanza = strdup(text);
 
     GList* curr = values;
     while (curr) {
         ProfPlugin* plugin = curr->data;
         new_stanza = plugin->on_iq_stanza_send(plugin, curr_stanza);
         if (new_stanza) {
-            g_free(curr_stanza);
+            free(curr_stanza);
             curr_stanza = new_stanza;
         }
         curr = g_list_next(curr);