Merge branch 'master' into build/multicore

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+<!--- More than 50 issues open? Please don't file any new feature requests -->
+<!--- Help us reduce the work first :-) -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Describe, in detail, what needs to happen to reproduce this bug -->
+<!--- Give us a screenshot (if it's helpful for this particular bug) -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+
+## Environment
+* Give us the version and build information output generated by `profanity -v`
+* If you could not yet build profanity, mention the revision you try to build from
+* Operating System/Distribution
+* glib version
+* libstrophe version
+* Some bugs might be due to specific implementation in the server. `/serversoftware example.domain` can be helpful

.github/workflows/main.yml

@@ -90,3 +90,31 @@ jobs:
       - name: Check spelling
         run: |
           codespell
+
+  test-c-api-docs:
+    runs-on: ubuntu-latest
+    name: Test C API Documentation Generation
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends make doxygen
+      - name: Test C API docs generation
+        run: |
+          cd apidocs/c/
+          doxygen c-prof.conf
+
+  test-python-api-docs:
+    runs-on: ubuntu-latest
+    name: Test Python API Documentation Generation
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends make python3-sphinx
+      - name: Test Python API docs generation
+        run: |
+          cd apidocs/python/
+          sphinx-apidoc -f -o . src && make -j$(nproc) xml SPHINXOPTS="-W --keep-going -n"

Makefile.am

@@ -124,6 +124,7 @@ unittest_sources = \
 	src/event/server_events.c src/event/server_events.h \
 	src/event/client_events.c src/event/client_events.h \
 	src/ui/tray.h src/ui/tray.c \
+	tests/prof_cmocka.h \
 	tests/unittests/xmpp/stub_vcard.c \
 	tests/unittests/xmpp/stub_avatar.c \
 	tests/unittests/xmpp/stub_ox.c \
@@ -170,6 +171,7 @@ unittest_sources = \
 	tests/unittests/unittests.c
 
 functionaltest_sources = \
+	tests/prof_cmocka.h \
 	tests/functionaltests/proftest.c tests/functionaltests/proftest.h \
 	tests/functionaltests/test_connect.c tests/functionaltests/test_connect.h \
 	tests/functionaltests/test_ping.c tests/functionaltests/test_ping.h \
@@ -284,6 +286,7 @@ endif
 
 TESTS = tests/unittests/unittests
 check_PROGRAMS = tests/unittests/unittests
+tests_unittests_unittests_CPPFLAGS = -Itests/
 tests_unittests_unittests_SOURCES = $(unittest_sources)
 tests_unittests_unittests_LDADD = -lcmocka
 
@@ -347,9 +350,13 @@ endif
 .PHONY: my-prof.supp
 my-prof.supp:
 	@sed '/^# AUTO-GENERATED START/q' prof.supp > $@
+	@printf "\n\n# glib\n" >> $@
 	@cat /usr/share/glib-2.0/valgrind/glib.supp >> $@
+	@printf "\n\n# Python\n" >> $@
 	@wget -O- https://raw.githubusercontent.com/python/cpython/refs/tags/v`python3 --version | cut -d' ' -f2`/Misc/valgrind-python.supp >> $@
+	@printf "\n\n# gtk\n" >> $@
 	@test -z "@GTK_VERSION@" || wget -O- https://raw.githubusercontent.com/GNOME/gtk/refs/tags/@GTK_VERSION@/gtk.supp >> $@
+	@printf "\n\n# more gtk\n" >> $@
 	@test -z "@GTK_VERSION@" || cat /usr/share/gtk-3.0/valgrind/gtk.supp >> $@
 
 check-unit: tests/unittests/unittests

apidocs/c/profapi.h

@@ -450,7 +450,7 @@ int prof_chat_show_themed(char *barejid, char *group, char *item, char *def, cha
 
 /**
 Show a message in a chat room window.
-@param barejid Jabber ID of the room
+@param roomjid Jabber ID of the room
 @param message the message to print
 @return 1 on success, 0 on failure
 */
@@ -459,7 +459,7 @@ int prof_room_show(char *roomjid, char *message);
 /**
 Show a message in a chat room window, using the specified theme, and prefix character
 Themes are specified in ~/.local/share/profanity/plugin_themes
-@param barejid Jabber ID of the room
+@param roomjid Jabber ID of the room
 @param group the group name in the themes file or NULL
 @param item the item name within the group or NULL
 @param def default colour if the theme cannot be found

apidocs/python/conf.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Profanity Python Plugins API documentation build configuration file, created by
-# sphinx-quickstart on Thu Mar 17 23:01:31 2016.
+# CProof Python Plugins API documentation build configuration file.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
@@ -47,25 +46,25 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Profanity Python Plugins API'
-copyright = u'2016 - 2018, boothj5'
-author = u'boothj5'
+project = u'CProof Python Plugins API'
+copyright = u'2025, CProof, based on Profanity by boothj5 et al.'
+author = u'CProof Developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.5.0'
+version = u'0.15.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.5.0'
+release = u'0.15.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -75,7 +74,7 @@ language = None
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['_build', 'modules.rst']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -122,7 +121,7 @@ html_theme = 'default'
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = "Profanity Python Plugins"
+html_title = "CProof Python Plugins"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -139,7 +138,7 @@ html_title = "Profanity Python Plugins"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -202,7 +201,7 @@ html_show_copyright = False
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'ProfanityPythonPluginsAPIdoc'
+htmlhelp_basename = 'CProofPythonPluginsAPIdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -224,8 +223,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'ProfanityPythonPluginsAPI.tex', u'Profanity Python Plugins API Documentation',
-     u'boothj5', 'manual'),
+    (master_doc, 'CProofPythonPluginsAPI.tex', u'CProof Python Plugins API Documentation',
+     u'CProof Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -254,7 +253,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'profanitypythonpluginsapi', u'Profanity Python Plugins API Documentation',
+    (master_doc, 'cproofpythonpluginsapi', u'CProof Python Plugins API Documentation',
      [author], 1)
 ]
 

apidocs/python/index.rst

@@ -1,8 +1,8 @@
-Profanity Python Plugins API
-============================
+CProof Python Plugins API
+===========================
 
-The ``prof`` module describes functions that plugins may call to interact with Profanity.
-The ``plugin`` module describes functions that plugins may define to be notified of various events in Profanity.
+The ``prof`` module describes functions that plugins may call to interact with CProof.
+The ``plugin`` module describes functions that plugins may define to be notified of various events in CProof.
 
 Contents:
 
@@ -11,4 +11,5 @@ Contents:
 
    prof
    plugin
-* :ref:`genindex`
+
+:ref:`genindex`

apidocs/python/src/plugin.py

@@ -1,360 +1,641 @@
 """
-This page describes functions that plugins may implement to be called from Profanity on certain events. All functions are optional.
+The plugin module defines optional callback functions that CProof plugins can
+implement to handle events such as startup, shutdown, message processing, and
+presence updates.
 
-Examples:
 ::
-    def prof_on_start():
-        prof.cons_show("Profanity has started...")
 
-    def prof_pre_room_message_display(room, nick, message):
-        prof.cons_show("Manipulating chat room message before display...")
-        new_message = message + " (added by plugin)"
-        return new_message
+    import prof
 
-    def prof_on_contact_presence(barejid, resource, presence, status, priority):
-        notify_message = barejid + " is " + presence
-        prof.notify(notify_message, 5, "Presence")
+All functions are optional and are called by CProof when the corresponding event
+occurs. String parameters and return values are Python 3 str types.
 """
 
-def prof_init(version, status, account_name, fulljid):
-    """Called when a plugin is loaded, either when profanity is started, or when the ``/plugins load`` or ``/plugins install`` commands are called
+# Initialization and Lifecycle
+# ---------------------------
 
-    :param version: the version of Profanity
-    :param status: the package status of Profanity, ``"development"`` or ``"release"``
-    :param account_name: account name of the currently logged in account, or ``None`` if not logged in
-    :param fulljid: the users full Jabber ID (barejid and resource) if logged in, ``None`` otherwise
-    :type version: str or unicode
-    :type status: str or unicode
-    :type account_name: str, unicode or None
-    :type fulljid: str, unicode or None
+def prof_init(version: str, status: str, account_name: str | None, fulljid: str | None) -> None:
+    """Initializes the plugin when loaded by CProof.
+
+    Called when CProof starts or when the plugin is loaded via the ``/plugins load``
+    or ``/plugins install`` commands.
+
+    Args:
+        version: The version of CProof (e.g., ``"1.0.0"``).
+        status: The package status of CProof (``"development"`` or ``"release"``).
+        account_name: The account name of the logged-in user, or None if not logged in.
+        fulljid: The full Jabber ID (barejid/resource) of the logged-in user, or None if not logged in.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_init(version: str, status: str, account_name: str | None, fulljid: str | None) -> None:
+                prof.cons_show(f"MyPlugin for CProof {version} ({status}) has been loaded, account: {account_name}")
     """
     pass
 
+def prof_on_start() -> None:
+    """Called when CProof starts.
 
-def prof_on_start():
-    """Called when Profanity is started
+    Use this to perform setup tasks that should occur at application startup.
+
+    Args:
+        None
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_start() -> None:
+                prof.cons_show("CProof has started...")
     """
     pass
 
+def prof_on_shutdown() -> None:
+    """Called when CProof is shutting down.
 
-def prof_on_shutdown():
-    """Called when the user quits Profanity
+    Use this to perform cleanup tasks before the application exits.
+
+    Args:
+        None
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_shutdown() -> None:
+                prof.cons_show("CProof is shutting down...")
     """
     pass
 
+def prof_on_unload() -> None:
+    """Called when the plugin is unloaded via the ``/plugins unload`` command.
 
-def prof_on_unload():
-    """Called when a plugin is unloaded with the ``/plugins unload`` command
+    Use this to clean up plugin-specific resources.
+
+    Args:
+        None
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_unload() -> None:
+                prof.cons_show("Plugin unloaded")
     """
     pass
 
+def prof_on_connect(account_name: str, fulljid: str) -> None:
+    """Called when a user connects to CProof with an account.
 
-def prof_on_connect(account_name, fulljid):
-    """Called when the user connects with an account
+    Args:
+        account_name: The account name used for login.
+        fulljid: The full Jabber ID (barejid/resource) of the connected account.
 
-    :param account_name: account name of the account used for logging in
-    :param fulljid: the full Jabber ID (barejid and resource) of the account
-    :type account_name: str or unicode
-    :type fulljid: str or unicode
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_connect(account_name: str, fulljid: str) -> None:
+                prof.cons_show(f"Connected as {account_name} ({fulljid})")
     """
     pass
 
+def prof_on_disconnect(account_name: str, fulljid: str) -> None:
+    """Called when a user disconnects an account from CProof.
 
-def prof_on_disconnect(account_name, fulljid):
-    """Called when the user disconnects an account
+    Args:
+        account_name: The account name being disconnected.
+        fulljid: The full Jabber ID (barejid/resource) of the disconnected account.
 
-    :param account_name: account name of the account being disconnected
-    :param fulljid: the full Jabber ID (barejid and resource) of the account
-    :type account_name: str or unicode
-    :type fulljid: str or unicode
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_disconnect(account_name: str, fulljid: str) -> None:
+                prof.cons_show(f"Disconnected {account_name} ({fulljid})")
     """
     pass
 
+# Chat Message Handlers
+# ---------------------
 
-def prof_pre_chat_message_display(barejid, resource, message):
-    """Called before a chat message is displayed
+def prof_pre_chat_message_display(barejid: str, resource: str, message: str) -> str | None:
+    """Called before a chat message is displayed in a chat window.
 
-    :param barejid: Jabber ID of the message sender
-    :param resource: resource of the message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type resource: str or unicode
-    :type message: str or unicode
-    :return: the new message to display, or ``None`` to preserve the original message
-    :rtype: str or unicode
+    Allows the plugin to modify or cancel the message display.
+
+    Args:
+        barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
+        resource: The sender's resource (e.g., ``laptop``).
+        message: The received message.
+
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_pre_chat_message_display(barejid: str, resource: str, message: str) -> str | None:
+                new_message = f"{message} (from {barejid})"
+                return new_message
     """
     pass
 
+def prof_post_chat_message_display(barejid: str, resource: str, message: str) -> None:
+    """Called after a chat message is displayed in a chat window.
 
-def prof_post_chat_message_display(barejid, resource, message):
-    """Called after a chat message is displayed
+    Use this to perform actions after the message is shown.
 
-    :param barejid: Jabber ID of the message sender
-    :param resource: resource of the message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type resource: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the message sender (e.g., ``bob@example.com``).
+        resource: The sender's resource (e.g., ``laptop``).
+        message: The displayed message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_chat_message_display(barejid: str, resource: str, message: str) -> None:
+                prof.cons_show(f"Displayed message from {barejid}/{resource}: {message}")
     """
     pass
 
+def prof_pre_chat_message_send(barejid: str, message: str) -> str | None:
+    """Called before a chat message is sent from CProof.
 
-def prof_pre_chat_message_send(barejid, message):
-    """Called before a chat message is sent
+    Allows the plugin to modify or cancel the message.
 
-    :param barejid: Jabber ID of the message recipient
-    :param message: the message to be sent
-    :type barejid: str or unicode
-    :type message: str or unicode
-    :return: the modified or original message to send, or ``None`` to cancel sending of the message
-    :rtype: str or unicode
+    Args:
+        barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
+        message: The message to be sent.
+
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
+
+            def prof_pre_chat_message_send(barejid: str, message: str) -> str | None:
+                return f"{message} (sent by plugin)"
     """
     pass
 
+def prof_post_chat_message_send(barejid: str, message: str) -> None:
+    """Called after a chat message is sent from CProof.
 
-def prof_post_chat_message_send(barejid, message):
-    """Called after a chat message has been sent
+    Use this to log or react to sent messages.
 
-    :param barejid: Jabber ID of the message recipient
-    :param message: the sent message
-    :type barejid: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the recipient (e.g., ``bob@example.com``).
+        message: The sent message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_chat_message_send(barejid: str, message: str) -> None:
+                prof.cons_show(f"Sent to {barejid}: {message}")
     """
     pass
 
+# Room Message Handlers
+# ---------------------
 
-def prof_pre_room_message_display(barejid, nick, message):
-    """Called before a chat room message is displayed
+def prof_pre_room_message_display(barejid: str, nick: str, message: str) -> str | None:
+    """Called before a chat room message is displayed.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
-    :return: the new message to display, or ``None`` to preserve the original message
-    :rtype: str or unicode
+    Allows the plugin to modify or cancel the message display.
+
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
+
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_pre_room_message_display(barejid: str, nick: str, message: str) -> str | None:
+                return f"{message} (from {nick})"
     """
     pass
 
+def prof_post_room_message_display(barejid: str, nick: str, message: str) -> None:
+    """Called after a chat room message is displayed.
 
-def prof_post_room_message_display(barejid, nick, message):
-    """Called after a chat room message is displayed
+    Use this to perform actions after the message is shown.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of the message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The displayed message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_room_message_display(barejid: str, nick: str, message: str) -> None:
+                prof.cons_show(f"Displayed in {barejid} from {nick}: {message}")
     """
     pass
 
+def prof_pre_room_message_send(barejid: str, message: str) -> str | None:
+    """Called before a chat room message is sent.
 
-def prof_pre_room_message_send(barejid, message):
-    """Called before a chat room message is sent
+    Allows the plugin to modify or cancel the message.
 
-    :param barejid: Jabber ID of the room
-    :param message: the message to be sent
-    :type barejid: str or unicode
-    :type message: str or unicode
-    :return: the modified or original message to send, or ``None`` to cancel sending of the message
-    :rtype: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        message: The message to be sent.
+
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
+
+            def prof_pre_room_message_send(barejid: str, message: str) -> str | None:
+                return f"{message} (sent by plugin)"
     """
     pass
 
+def prof_post_room_message_send(barejid: str, message: str) -> None:
+    """Called after a chat room message is sent.
 
-def prof_post_room_message_send(barejid, message):
-    """Called after a chat room message has been sent
+    Use this to log or react to sent messages.
 
-    :param barejid: Jabber ID of the room
-    :param message: the sent message
-    :type barejid: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        message: The sent message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_room_message_send(barejid: str, message: str) -> None:
+                prof.cons_show(f"Sent to {barejid}: {message}")
     """
     pass
 
+def prof_on_room_history_message(barejid: str, nick: str, message: str, timestamp: str) -> None:
+    """Called when a chat room history message is received from the server.
 
-def prof_on_room_history_message(barejid, nick, message, timestamp):
-    """Called when the server sends a chat room history message
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
+        timestamp: The message's original send time in ISO 8601 format (e.g., ``2025-09-10T19:45:00Z``).
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of the message sender
-    :param message: the message to be sent
-    :param timestamp: time the message was originally sent to the room, in ISO8601 format
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
-    :type timestamp: str or unicode
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_room_history_message(barejid: str, nick: str, message: str, timestamp: str) -> None:
+                prof.cons_show(f"History in {barejid} from {nick} at {timestamp}: {message}")
     """
     pass
 
+# Private Message Handlers
+# ------------------------
 
-def prof_pre_priv_message_display(barejid, nick, message):
-    """Called before a private chat room message is displayed
+def prof_pre_priv_message_display(barejid: str, nick: str, message: str) -> str | None:
+    """Called before a private chat room message is displayed.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
-    :return: the new message to display, or ``None`` to preserve the original message
-    :rtype: str or unicode
+    Allows the plugin to modify or cancel the message display.
+
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The received message.
+
+    Returns:
+        str | None: The modified message to display, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_pre_priv_message_display(barejid: str, nick: str, message: str) -> str | None:
+                return f"{message} (private from {nick})"
     """
     pass
 
+def prof_post_priv_message_display(barejid: str, nick: str, message: str) -> None:
+    """Called after a private chat room message is displayed.
 
-def prof_post_priv_message_display(barejid, nick, message):
-    """Called after a private chat room message is displayed
+    Use this to perform actions after the message is shown.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of the message sender
-    :param message: the received message
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message sender.
+        message: The displayed message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_priv_message_display(barejid: str, nick: str, message: str) -> None:
+                prof.cons_show(f"Displayed private in {barejid} from {nick}: {message}")
     """
     pass
 
+def prof_pre_priv_message_send(barejid: str, nick: str, message: str) -> str | None:
+    """Called before a private chat room message is sent.
 
-def prof_pre_priv_message_send(barejid, nick, message):
-    """Called before a private chat room message is sent
+    Allows the plugin to modify or cancel the message.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of message recipient
-    :param message: the message to be sent
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
-    :return: the modified or original message to send, or ``None`` to cancel sending of the message
-    :rtype: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message recipient.
+        message: The message to be sent.
+
+    Returns:
+        str | None: The modified message to send, or None to cancel sending.
+
+    Example:
+
+        ::
+
+            def prof_pre_priv_message_send(barejid: str, nick: str, message: str) -> str | None:
+                return f"{message} (private to {nick})"
     """
     pass
 
+def prof_post_priv_message_send(barejid: str, nick: str, message: str) -> None:
+    """Called after a private chat room message is sent.
 
-def prof_post_priv_message_send(barejid, nick, message):
-    """Called after a private chat room message has been sent
+    Use this to log or react to sent messages.
 
-    :param barejid: Jabber ID of the room
-    :param nick: nickname of the message recipient
-    :param message: the sent message
-    :type barejid: str or unicode
-    :type nick: str or unicode
-    :type message: str or unicode
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
+        nick: The nickname of the message recipient.
+        message: The sent message.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_post_priv_message_send(barejid: str, nick: str, message: str) -> None:
+                prof.cons_show(f"Sent private to {nick} in {barejid}: {message}")
     """
     pass
 
+# Stanza Handlers
+# ---------------
 
-def prof_on_message_stanza_send(stanza):
-    """Called before an XMPP message stanza is sent
+def prof_on_message_stanza_send(stanza: str) -> str | None:
+    """Called before an XMPP message stanza is sent.
 
-    :param stanza: The stanza to send
-    :type stanza: str or unicode
-    :return: The new stanza to send, or ``None`` to preserve the original stanza
-    :rtype: str or unicode
+    Allows the plugin to modify or cancel the stanza.
+
+    Args:
+        stanza: The XMPP message stanza to send.
+
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_on_message_stanza_send(stanza: str) -> str | None:
+                prof.cons_show(f"Sending message stanza: {stanza}")
+                return stanza
     """
     pass
 
+def prof_on_message_stanza_receive(stanza: str) -> bool:
+    """Called when an XMPP message stanza is received.
 
-def prof_on_message_stanza_receive(stanza):
-    """Called when an XMPP message stanza is received
+    Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The stanza received
-    :type stanza: str or unicode
-    :return: ``True`` if Profanity should continue to process the message stanza, ``False`` otherwise
-    :rtype: boolean
+    Args:
+        stanza: The received XMPP message stanza.
+
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
+
+            def prof_on_message_stanza_receive(stanza: str) -> bool:
+                prof.cons_show(f"Received message stanza: {stanza}")
+                return True
     """
     pass
 
+def prof_on_presence_stanza_send(stanza: str) -> str | None:
+    """Called before an XMPP presence stanza is sent.
 
-def prof_on_presence_stanza_send(stanza):
-    """Called before an XMPP presence stanza is sent
+    Allows the plugin to modify or cancel the stanza.
 
-    :param stanza: The stanza to send
-    :type stanza: str or unicode
-    :return: The new stanza to send, or ``None`` to preserve the original stanza
-    :rtype: str or unicode
+    Args:
+        stanza: The XMPP presence stanza to send.
+
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_on_presence_stanza_send(stanza: str) -> str | None:
+                prof.cons_show(f"Sending presence stanza: {stanza}")
+                return stanza
     """
     pass
 
+def prof_on_presence_stanza_receive(stanza: str) -> bool:
+    """Called when an XMPP presence stanza is received.
 
-def prof_on_presence_stanza_receive(stanza):
-    """Called when an XMPP presence stanza is received
+    Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The stanza received
-    :type stanza: str or unicode
-    :return: ``True`` if Profanity should continue to process the presence stanza, ``False`` otherwise
-    :rtype: boolean
+    Args:
+        stanza: The received XMPP presence stanza.
+
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
+
+            def prof_on_presence_stanza_receive(stanza: str) -> bool:
+                prof.cons_show(f"Received presence stanza: {stanza}")
+                return True
     """
     pass
 
+def prof_on_iq_stanza_send(stanza: str) -> str | None:
+    """Called before an XMPP IQ stanza is sent.
 
-def prof_on_iq_stanza_send(stanza):
-    """Called before an XMPP iq stanza is sent
+    Allows the plugin to modify or cancel the stanza.
 
-    :param stanza: The stanza to send
-    :type stanza: str or unicode
-    :return: The new stanza to send, or ``None`` to preserve the original stanza
-    :rtype: str or unicode
+    Args:
+        stanza: The XMPP IQ stanza to send.
+
+    Returns:
+        str | None: The modified stanza to send, or None to preserve the original.
+
+    Example:
+
+        ::
+
+            def prof_on_iq_stanza_send(stanza: str) -> str | None:
+                prof.cons_show(f"Sending IQ stanza: {stanza}")
+                return stanza
     """
     pass
 
+def prof_on_iq_stanza_receive(stanza: str) -> bool:
+    """Called when an XMPP IQ stanza is received.
 
-def prof_on_iq_stanza_receive(stanza):
-    """Called when an XMPP iq stanza is received
+    Allows the plugin to control whether CProof processes the stanza.
 
-    :param stanza: The stanza received
-    :type stanza: str or unicode
-    :return: ``True`` if Profanity should continue to process the iq stanza, ``False`` otherwise
-    :rtype: boolean
+    Args:
+        stanza: The received XMPP IQ stanza.
+
+    Returns:
+        bool: True to allow CProof to process the stanza, False to block processing.
+
+    Example:
+
+        ::
+
+            def prof_on_iq_stanza_receive(stanza: str) -> bool:
+                prof.cons_show(f"Received IQ stanza: {stanza}")
+                return True
     """
     pass
 
+# Contact Presence Handlers
+# -------------------------
 
-def prof_on_contact_offline(barejid, resource, status):
-    """Called when a contact goes offline
+def prof_on_contact_offline(barejid: str, resource: str, status: str | None) -> None:
+    """Called when a contact goes offline.
 
-    :param barejid: Jabber ID of the contact
-    :param resource: the resource being disconnected
-    :param status: the status message received with the offline presence, or ``None``
-    :type barejid: str or unicode
-    :type resource: str or unicode
-    :type status: str or unicode
+    Args:
+        barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
+        resource: The resource being disconnected (e.g., ``laptop``).
+        status: The status message received with the offline presence, or None.
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_contact_offline(barejid: str, resource: str, status: str | None) -> None:
+                prof.cons_show(f"{barejid}/{resource} went offline: {status or 'No status'}")
     """
     pass
 
+def prof_on_contact_presence(barejid: str, resource: str, presence: str, status: str | None, priority: int) -> None:
+    """Called when a presence notification is received from a contact.
 
-def prof_on_contact_presence(barejid, resource, presence, status, priority):
-    """Called when a presence notification is received from a contact
+    Args:
+        barejid: The Jabber ID of the contact (e.g., ``bob@example.com``).
+        resource: The resource of the contact (e.g., ``laptop``).
+        presence: The contact's presence (``"chat"``, ``"online"``, ``"away"``, ``"xa"``, or ``"dnd"``).
+        status: The status message received with the presence, or None.
+        priority: The priority associated with the resource.
 
-    :param barejid: Jabber ID of the contact
-    :param resource: the resource being disconnected
-    :param presence: presence of the contact, one of ``"chat"``, ``"online"``, ``"away"``, ``"xa"`` or ``"dnd"``
-    :param status: the status message received with the presence, or ``None``
-    :param priority: the priority associated with the resource
-    :type barejid: str or unicode
-    :type resource: str or unicode
-    :type presence: str or unicode
-    :type status: str or unicode
-    :type priority: int
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_contact_presence(barejid: str, resource: str, presence: str, status: str | None, priority: int) -> None:
+                prof.notify(f"{barejid} is {presence}", 5000, "Presence")
     """
     pass
 
+# Window Focus Handlers
+# ---------------------
 
-def prof_on_chat_win_focus(barejid):
-    """Called when a chat window is focused
+def prof_on_chat_win_focus(barejid: str) -> None:
+    """Called when a chat window is focused.
 
-    :param barejid: Jabber ID of the chat window recipient
-    :type barejid: str or unicode
+    Args:
+        barejid: The Jabber ID of the chat window recipient (e.g., ``bob@example.com``).
+
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_chat_win_focus(barejid: str) -> None:
+                prof.cons_show(f"Focused chat window for {barejid}")
     """
     pass
 
+def prof_on_room_win_focus(barejid: str) -> None:
+    """Called when a chat room window is focused.
 
-def prof_on_room_win_focus(barejid):
-    """Called when a chat room window is focused
+    Args:
+        barejid: The Jabber ID of the room (e.g., ``chat@conference.example.com``).
 
-    :param barejid: Jabber ID of the room
-    :type barejid: str or unicode
+    Returns:
+        None
+
+    Example:
+
+        ::
+
+            def prof_on_room_win_focus(barejid: str) -> None:
+                prof.cons_show(f"Focused room window for {barejid}")
     """
     pass

src/command/cmd_ac.c

@@ -1675,7 +1675,7 @@ char*
 cmd_ac_complete_filepath(const char* const input, char* const startstr, gboolean previous)
 {
     unsigned int output_off = 0;
-    char* tmp;
+    char* tmp = NULL;
 
     // strip command
     char* inpcp = (char*)input + strlen(startstr);
@@ -1687,38 +1687,36 @@ cmd_ac_complete_filepath(const char* const input, char* const startstr, gboolean
 
     // strip quotes
     if (*inpcp == '"') {
-        tmp = strchr(inpcp + 1, '"');
+        tmp = strrchr(inpcp + 1, '"');
         if (tmp) {
             *tmp = '\0';
         }
         tmp = strdup(inpcp + 1);
         free(inpcp);
         inpcp = tmp;
+        tmp = NULL;
     }
 
     // expand ~ to $HOME
     if (inpcp[0] == '~' && inpcp[1] == '/') {
-        tmp = g_strdup_printf("%s/%sfoo", getenv("HOME"), inpcp + 2);
-        if (!tmp) {
+        char* home = getenv("HOME");
+        if (!home) {
             free(inpcp);
             return NULL;
         }
-        output_off = strlen(getenv("HOME")) + 1;
+        tmp = g_strdup_printf("%s/%sfoo", home, inpcp + 2);
+        output_off = strlen(home) + 1;
     } else {
         tmp = g_strdup_printf("%sfoo", inpcp);
-        if (!tmp) {
-            free(inpcp);
-            return NULL;
-        }
     }
     free(inpcp);
-    inpcp = tmp;
+    if (!tmp) {
+        return NULL;
+    }
 
-    char* inpcp2 = strdup(inpcp);
-    char* foofile = strdup(basename(inpcp2));
-    char* directory = strdup(dirname(inpcp));
-    free(inpcp);
-    free(inpcp2);
+    char* foofile = strdup(basename(tmp));
+    char* directory = strdup(dirname(tmp));
+    g_free(tmp);
 
     GArray* files = g_array_new(TRUE, FALSE, sizeof(char*));
     g_array_set_clear_func(files, (GDestroyNotify)_filepath_item_free);
@@ -1737,40 +1735,26 @@ cmd_ac_complete_filepath(const char* const input, char* const startstr, gboolean
                 continue;
             }
 
-            char* acstring;
+            char* acstring = NULL;
             if (output_off) {
                 tmp = g_strdup_printf("%s/%s", directory, dir->d_name);
-                if (!tmp) {
-                    free(directory);
-                    free(foofile);
-                    return NULL;
+                if (tmp) {
+                    acstring = g_strdup_printf("~/%s", tmp + output_off);
+                    g_free(tmp);
                 }
-                acstring = g_strdup_printf("~/%s", tmp + output_off);
-                if (!acstring) {
-                    free(directory);
-                    free(foofile);
-                    return NULL;
-                }
-                free(tmp);
             } else if (strcmp(directory, "/") == 0) {
                 acstring = g_strdup_printf("/%s", dir->d_name);
-                if (!acstring) {
-                    free(directory);
-                    free(foofile);
-                    return NULL;
-                }
             } else {
                 acstring = g_strdup_printf("%s/%s", directory, dir->d_name);
-                if (!acstring) {
-                    free(directory);
-                    free(foofile);
-                    return NULL;
-                }
+            }
+            if (!acstring) {
+                g_array_free(files, TRUE);
+                free(foofile);
+                free(directory);
+                return NULL;
             }
 
-            char* acstring_cpy = strdup(acstring);
-            g_array_append_val(files, acstring_cpy);
-            free(acstring);
+            g_array_append_val(files, acstring);
         }
         closedir(d);
     }

src/command/cmd_defs.c

@@ -433,7 +433,7 @@ static const struct cmd_t command_defs[] = {
               { "<contact>", "The contact you wish to view information about." },
               { "<nick>", "When in a chat room, the occupant you wish to view information about." })
       CMD_EXAMPLES(
-              "/info thor@aasgard.server.org",
+              "/info thor@asgard.server.org",
               "/info heimdall")
     },
 

src/command/cmd_funcs.c

@@ -8577,19 +8577,20 @@ cmd_omemo_trust_mode(ProfWin* window, const char* const command, gchar** args)
 {
 #ifdef HAVE_OMEMO
 
+    auto_gchar gchar* trust_mode = prefs_get_string(PREF_OMEMO_TRUST_MODE);
     if (!args[1]) {
-        cons_show("Current trust mode is %s", prefs_get_string(PREF_OMEMO_TRUST_MODE));
+        cons_show("Current trust mode is %s", trust_mode);
         return TRUE;
     }
 
     if (g_strcmp0(args[1], "manual") == 0) {
-        cons_show("Current trust mode is %s - setting to %s", prefs_get_string(PREF_OMEMO_TRUST_MODE), args[1]);
+        cons_show("Current trust mode is %s - setting to %s", trust_mode, args[1]);
         cons_show("You need to trust all OMEMO fingerprints manually");
     } else if (g_strcmp0(args[1], "firstusage") == 0) {
-        cons_show("Current trust mode is %s - setting to %s", prefs_get_string(PREF_OMEMO_TRUST_MODE), args[1]);
+        cons_show("Current trust mode is %s - setting to %s", trust_mode, args[1]);
         cons_show("The first seen OMEMO fingerprints will be trusted automatically - new keys must be trusted manually");
     } else if (g_strcmp0(args[1], "blind") == 0) {
-        cons_show("Current trust mode is %s - setting to %s", prefs_get_string(PREF_OMEMO_TRUST_MODE), args[1]);
+        cons_show("Current trust mode is %s - setting to %s", trust_mode, args[1]);
         cons_show("ALL OMEMO fingerprints will be trusted automatically");
     } else {
         cons_bad_cmd_usage(command);

src/common.c

@@ -45,6 +45,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 
 #include <curl/curl.h>
 #include <curl/easy.h>
@@ -199,6 +200,10 @@ load_custom_keyfile(prof_keyfile_t* keyfile, gchar* filename)
 
     if (g_file_test(keyfile->filename, G_FILE_TEST_EXISTS)) {
         g_chmod(keyfile->filename, S_IRUSR | S_IWUSR);
+    } else {
+        int fno = g_creat(keyfile->filename, S_IRUSR | S_IWUSR);
+        if (fno != -1)
+            g_close(fno, NULL);
     }
 
     return _load_keyfile(keyfile);

src/plugins/python_plugins.c

@@ -86,10 +86,16 @@ python_get_version_number(void)
     return version_number;
 }
 
+static void
+_unref_module(PyObject* module)
+{
+    Py_XDECREF(module);
+}
+
 void
 python_env_init(void)
 {
-    loaded_modules = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)Py_XDECREF);
+    loaded_modules = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_unref_module);
 
     python_init_prof();
 

src/ui/inputwin.c

@@ -170,6 +170,29 @@ create_input_window(void)
     _inp_win_update_virtual();
 }
 
+static gboolean
+_inp_slashguard_check(void)
+{
+    if (get_password)
+        return false;
+    /* ignore empty and quoted messages */
+    if (inp_line == NULL || inp_line[0] == '\0' || inp_line[0] == '>')
+        return false;
+    if (!prefs_get_boolean(PREF_SLASH_GUARD))
+        return false;
+    size_t n = 1;
+    while (inp_line[n] != '\0' && n < 4) {
+        if (inp_line[n] == '/') {
+            cons_show("Your text contains a slash in the first 4 characters");
+            free(inp_line);
+            inp_line = NULL;
+            return true;
+        }
+        n++;
+    }
+    return false;
+}
+
 char*
 inp_readline(void)
 {
@@ -203,17 +226,7 @@ inp_readline(void)
         chat_state_idle();
     }
 
-    if (inp_line) {
-        if (!get_password && prefs_get_boolean(PREF_SLASH_GUARD)) {
-            // ignore quoted messages
-            if (strlen(inp_line) > 1 && inp_line[0] != '>') {
-                char* res = (char*)memchr(inp_line + 1, '/', 3);
-                if (res) {
-                    cons_show("Your text contains a slash in the first 4 characters");
-                    return NULL;
-                }
-            }
-        }
+    if (inp_line && !_inp_slashguard_check()) {
         char* ret = inp_line;
         inp_line = NULL;
         return ret;

tests/functionaltests/functionaltests.c

@@ -1,10 +1,7 @@
-#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <sys/stat.h>
 
 #include "config.h"

tests/functionaltests/proftest.c

@@ -2,11 +2,8 @@
 #include <sys/wait.h>
 #include <glib.h>
 
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

tests/functionaltests/test_carbons.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_chat_session.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_connect.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_disconnect.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_message.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_muc.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_ping.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_presence.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_receipts.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_rooms.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_roster.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/functionaltests/test_software.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/prof_cmocka.h

@@ -0,0 +1,5 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>

tests/unittests/chatlog/stub_chatlog.c

@@ -21,8 +21,7 @@
  */
 
 #include <glib.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include <xmpp/xmpp.h>
 

tests/unittests/config/stub_accounts.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "common.h"
 #include "config/account.h"

tests/unittests/database/stub_database.c

@@ -21,8 +21,7 @@
  */
 
 #include <glib.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "database.h"
 

tests/unittests/helpers.c

@@ -1,8 +1,5 @@
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
 #include <stdlib.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <glib.h>
 #include <stdio.h>
 #include <unistd.h>

tests/unittests/log/stub_log.c

@@ -21,8 +21,7 @@
  */
 
 #include <glib.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "log.h"
 

tests/unittests/otr/stub_otr.c

@@ -2,10 +2,7 @@
 #include <libotr/message.h>
 #include <glib.h>
 
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "config/account.h"
 

tests/unittests/test_autocomplete.c

@@ -1,8 +1,5 @@
 #include <glib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/contact.h"

tests/unittests/test_callbacks.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_chat_session.c

@@ -1,8 +1,5 @@
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/chat_session.h"

tests/unittests/test_cmd_account.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_alias.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_bookmark.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_connect.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_disconnect.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/unittests/test_cmd_join.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_otr.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_pgp.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_presence.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_rooms.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_roster.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_cmd_sub.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_common.c

@@ -1,9 +1,6 @@
 #include "xmpp/resource.h"
 #include "common.h"
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 void

tests/unittests/test_contact.c

@@ -1,9 +1,6 @@
 #include <glib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/contact.h"

tests/unittests/test_forced_encryption.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <glib.h>
 #include "event/client_events.h"
 #include "command/cmd_funcs.h"

tests/unittests/test_form.c

@@ -1,8 +1,5 @@
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/form.h"

tests/unittests/test_jid.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/jid.h"

tests/unittests/test_keyhandlers.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 

tests/unittests/test_muc.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/muc.h"

tests/unittests/test_parser.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "tools/parser.h"

tests/unittests/test_plugins_disco.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "plugins/disco.h"

tests/unittests/test_preferences.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/test_roster_list.c

@@ -1,9 +1,6 @@
 #include <glib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 
 #include "xmpp/contact.h"

tests/unittests/test_server_events.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>

tests/unittests/ui/stub_ui.c

@@ -3,8 +3,7 @@
 #include <glib.h>
 #include <wchar.h>
 
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "ui/window.h"
 #include "ui/ui.h"

tests/unittests/unittests.c

@@ -1,10 +1,7 @@
-#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <locale.h>

tests/unittests/xmpp/stub_xmpp.c

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
+#include "prof_cmocka.h"
 
 #include "xmpp/xmpp.h"