fix syntax error

Flatpak: missed changes to flatpak app id.
Tighten Flatpak D-Bus permissions
2026-06-13 10:20:18 +00:00 · 2026-05-22 01:55:53 -06:00 · 2026-05-22 01:35:49 -06:00 · 2026-05-22 00:34:09 -06:00 · 2026-05-22 00:29:13 -06:00 · 2026-05-22 00:23:42 -06:00
39 changed files with 224 additions and 502 deletions
--- a/.github/workflows/appimage-build.yml
+++ b/.github/workflows/appimage-build.yml
@@ -29,7 +29,6 @@ jobs:
            build-essential pkg-config meson ninja-build cmake \
            gettext \
            libcanberra-dev libglib2.0-dev \
-            libminiupnpc-dev \
            libarchive-dev \
            libgtk-3-dev \
            libwayland-client0 libwayland-cursor0 libwayland-egl1 \
@@ -87,21 +86,11 @@ jobs:
            cp -a /usr/lib/x86_64-linux-gnu/python3/dist-packages AppDir/usr/lib/x86_64-linux-gnu/python3/
          fi

-          if [ -d "/usr/lib/x86_64-linux-gnu/perl-base" ]; then
-            install -d AppDir/usr/lib/x86_64-linux-gnu
-            cp -a /usr/lib/x86_64-linux-gnu/perl-base AppDir/usr/lib/x86_64-linux-gnu/
-          fi
-
          if [ -d "/usr/lib/x86_64-linux-gnu/perl" ]; then
            install -d AppDir/usr/lib/x86_64-linux-gnu
            cp -a /usr/lib/x86_64-linux-gnu/perl AppDir/usr/lib/x86_64-linux-gnu/
          fi

-          if [ -d "/usr/lib/x86_64-linux-gnu/perl5" ]; then
-            install -d AppDir/usr/lib/x86_64-linux-gnu
-            cp -a /usr/lib/x86_64-linux-gnu/perl5 AppDir/usr/lib/x86_64-linux-gnu/
-          fi
-
          if [ -d "/usr/share/perl" ]; then
            install -d AppDir/usr/share
            cp -a /usr/share/perl AppDir/usr/share/
@@ -111,10 +100,6 @@ jobs:
            install -d AppDir/usr/share
            cp -a /usr/share/perl5 AppDir/usr/share/
          fi
-
-          perl -MFile::Spec -e 'print "Build host File::Spec: $INC{\"File/Spec.pm\"}\n"'
-          find AppDir/usr -path '*/File/Spec.pm' -print -quit | grep -q .
-
          if compgen -G '/usr/lib/x86_64-linux-gnu/libpython3*.so*' > /dev/null; then
            install -d AppDir/usr/lib/x86_64-linux-gnu
            cp -a /usr/lib/x86_64-linux-gnu/libpython3*.so* AppDir/usr/lib/x86_64-linux-gnu/
@@ -177,7 +162,7 @@ jobs:

          APPDIR="${APPDIR:-$(dirname "$(readlink -f "$0")")}"

-          export PATH="$APPDIR/usr/bin:${PATH:-/usr/bin:/bin}"
+          export PATH="${PATH:-/usr/bin:/bin}:$APPDIR/usr/bin"
          export LD_LIBRARY_PATH="$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH:-}"
          export XDG_DATA_DIRS="$APPDIR/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
          export GTK_EXE_PREFIX="$APPDIR/usr"
@@ -226,23 +211,6 @@ jobs:

          unset GTK_MODULES

-          perl5lib_entries=""
-          for dir in \
-            "$APPDIR/usr/lib/x86_64-linux-gnu/perl-base" \
-            "$APPDIR/usr/lib/x86_64-linux-gnu/perl"/* \
-            "$APPDIR/usr/lib/x86_64-linux-gnu/perl5"/* \
-            "$APPDIR/usr/share/perl"/* \
-            "$APPDIR/usr/share/perl5"
-          do
-            if [ -d "$dir" ]; then
-              perl5lib_entries="${perl5lib_entries:+$perl5lib_entries:}$dir"
-            fi
-          done
-
-          if [ -n "$perl5lib_entries" ]; then
-            export PERL5LIB="$perl5lib_entries${PERL5LIB:+:$PERL5LIB}"
-          fi
-
          export PYTHONHOME="$APPDIR/usr"
          python_stdlib_dir="$(find "$APPDIR/usr/lib" -maxdepth 1 -type d -name 'python3.*' | head -n 1 || true)"
          pythonpath_entries=""
@@ -288,12 +256,13 @@ jobs:
          EOF
          chmod +x AppRun

+
          VERSION="$(git describe --tags --always)"

          ./linuxdeploy-x86_64.AppImage \
            --appdir AppDir \
-            --desktop-file AppDir/usr/share/applications/net.zoite.Zoitechat.desktop \
-            --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/net.zoite.Zoitechat.png \
+            --desktop-file AppDir/usr/share/applications/org.zoitechat.ZoiteChat.desktop \
+            --icon-file AppDir/usr/share/icons/hicolor/48x48/apps/org.zoitechat.ZoiteChat.png \
            --custom-apprun ./AppRun \
            --plugin gtk \
            --output appimage
--- a/.github/workflows/flatpak-build.yml
+++ b/.github/workflows/flatpak-build.yml
@@ -33,7 +33,7 @@ jobs:
        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
        with:
          bundle: zoitechat.flatpak
-          manifest-path: flatpak/net.zoite.Zoitechat.json
+          manifest-path: flatpak/org.zoitechat.ZoiteChat.json
          cache: false
          restore-cache: false

--- a/.github/workflows/manjaro-package-build.yml
+++ b/.github/workflows/manjaro-package-build.yml
@@ -33,7 +33,6 @@ jobs:
            gtk3 \
            openssl \
            libcanberra \
-            miniupnpc \
            libayatana-appindicator \
            iso-codes \
            lua \
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,11 +1,11 @@
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 install_data(
  'zoitechat.png',
-  rename: 'net.zoite.Zoitechat.png',
+  rename: 'org.zoitechat.ZoiteChat.png',
  install_dir: join_paths(icondir, '48x48/apps')
 )
 install_data(
  'zoitechat.svg',
-  rename: 'net.zoite.Zoitechat.svg',
+  rename: 'org.zoitechat.ZoiteChat.svg',
  install_dir: join_paths(icondir, 'scalable/apps')
 )
--- a/data/misc/meson.build
+++ b/data/misc/meson.build
@@ -6,8 +6,8 @@ desktop_utils = find_program('desktop-file-validate', required: false)
 if get_option('gtk-frontend')
  if get_option('install-appdata')
    zoitechat_appdata = i18n.merge_file(
-      input: 'net.zoite.Zoitechat.appdata.xml.in',
-      output: 'net.zoite.Zoitechat.appdata.xml',
+      input: 'org.zoitechat.ZoiteChat.metainfo.xml.in',
+      output: 'org.zoitechat.ZoiteChat.metainfo.xml',
      po_dir: '../../po',
      install: true,
      install_dir: metainfodir
@@ -15,7 +15,7 @@ if get_option('gtk-frontend')

    appstreamcli = find_program('appstreamcli', required: false)
    if appstreamcli.found()
-      test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
+      test('Validate org.zoitechat.ZoiteChat.metainfo.xml', appstreamcli,
        args: ['validate', zoitechat_appdata]
      )
    endif
@@ -29,14 +29,14 @@ if get_option('gtk-frontend')
  endif

  desktop_file = configure_file(
-    input: 'net.zoite.Zoitechat.desktop.in.in',
-    output: 'net.zoite.Zoitechat.desktop.in',
+    input: 'org.zoitechat.ZoiteChat.desktop.in.in',
+    output: 'org.zoitechat.ZoiteChat.desktop.in',
    configuration: desktop_conf
  )

  zoitechat_desktop = i18n.merge_file(
    input: desktop_file,
-    output: 'net.zoite.Zoitechat.desktop',
+    output: 'org.zoitechat.ZoiteChat.desktop',
    po_dir: '../../po',
    type: 'desktop',
    install: true,
@@ -44,7 +44,7 @@ if get_option('gtk-frontend')
  )

  if desktop_utils.found()
-    test('Validate net.zoite.Zoitechat.desktop', desktop_utils,
+    test('Validate org.zoitechat.ZoiteChat.desktop', desktop_utils,
      args: [zoitechat_desktop]
    )
  endif
@@ -98,14 +98,14 @@ if get_option('plugin')
    conf.set('LICENSE', metainfo[2])

    plugin_appdata = configure_file(
-      input: 'net.zoite.Zoitechat.Plugin.metainfo.xml.in',
-      output: 'net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name),
+      input: 'org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in',
+      output: 'org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name),
      configuration: conf,
      install_dir: get_option('install-plugin-metainfo') ? metainfodir : '',
    )

    if appstreamcli.found()
-      test('Validate net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli,
+      test('Validate org.zoitechat.ZoiteChat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli,
        args: ['validate', plugin_appdata]
    )
    endif
--- a/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in
+++ b/data/misc/org.zoitechat.ZoiteChat.Plugin.metainfo.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
-  <id>net.zoite.Zoitechat.Plugin.@NAME@</id>
-  <extends>net.zoite.Zoitechat</extends>
+  <id>org.zoitechat.ZoiteChat.Plugin.@NAME@</id>
+  <extends>org.zoitechat.ZoiteChat</extends>
  <name>@NAME@ Plugin</name>
  <summary>@SUMMARY@</summary>
  <url type="homepage">https://zoitechat.org/</url>
--- a/data/misc/org.zoitechat.ZoiteChat.desktop.in.in
+++ b/data/misc/org.zoitechat.ZoiteChat.desktop.in.in
@@ -4,12 +4,12 @@ GenericName=IRC Client
 Comment=Chat with other people online
 Keywords=IM;Chat;
 Exec=@exec_command@
-Icon=net.zoite.Zoitechat
+Icon=org.zoitechat.ZoiteChat
 Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;
 StartupNotify=true
-StartupWMClass=net.zoite.Zoitechat
+StartupWMClass=org.zoitechat.ZoiteChat
 X-GNOME-UsesNotifications=true
 MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
 Actions=SafeMode;
--- a/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in
+++ b/data/misc/org.zoitechat.ZoiteChat.metainfo.xml.in
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>net.zoite.Zoitechat</id>
+  <id>org.zoitechat.ZoiteChat</id>
  <name>ZoiteChat</name>
-  <launchable type="desktop-id">net.zoite.Zoitechat.desktop</launchable>
+  <launchable type="desktop-id">org.zoitechat.ZoiteChat.desktop</launchable>

-  <developer id="net.zoite">
+  <developer id="org.zoitechat">
    <name translate="no">ZoiteChat</name>
  </developer>

@@ -26,7 +26,7 @@
    </screenshot>
  </screenshots>
  <provides>
-    <id>zoitechat.desktop</id>
+    <id>org.zoitechat.ZoiteChat.desktop</id>
  </provides>
 <releases>
 <release date="2026-05-21" version="2.18.1">
@@ -339,7 +339,7 @@
      <description>
        <p>This is largely a bug fix release though it has some large behind the scenes changes:</p>
        <ul>
-          <li>Rename data files to use *net.zoite.Zoitechat* name</li>
+          <li>Rename data files to use *org.zoitechat.ZoiteChat* name</li>
          <li>Add option (irc_reconnect_rejoin) to disable auto-rejoin on reconnect</li>
          <li>Add ability to set custom tray icon separate of app icon</li>
          <li>Fix Enchant 2.0+ support</li>
--- a/data/misc/org.zoitechat.ZoiteChat.mime.xml
+++ b/data/misc/org.zoitechat.ZoiteChat.mime.xml
--- a/flatpak/Load-plugins-from-Flatpak-extensions.patch
+++ b/flatpak/Load-plugins-from-Flatpak-extensions.patch
@@ -1,25 +1,17 @@
-From 918503d57c6740d20be68a6717158673a2a8b25f Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <tingping@tingping.se>
-Date: Sat, 17 Mar 2018 05:57:49 -0400
-Subject: [PATCH] Support loading Flatpak extensions
-
---
- src/common/plugin.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/plugin.c b/src/common/plugin.c
-index 3ad3c558..6addf962 100644
 --- a/src/common/plugin.c
 +++ b/src/common/plugin.c
-@@ -450,6 +450,8 @@ plugin_auto_load (session *sess)
- 	lib_dir = plugin_get_libdir ();
- 	sub_dir = g_build_filename (get_xdir (), "addons", NULL);
- 
-+	for_files ("/app/extensions/lib/zoitechat/plugins", "*.so", plugin_auto_load_cb);
+@@ -470,7 +470,14 @@
+ 	if (libdir && *libdir)
+ 		return libdir;
+ 	else
+	{
+		if (g_file_test ("/app/extensions/lib/zoitechat/plugins", G_FILE_TEST_IS_DIR))
+		{
+			return "/app/extensions/lib/zoitechat/plugins";
+		}
 +
- #ifdef WIN32
- 	/* a long list of bundled plugins that should be loaded automatically,
- 	 * user plugins should go to <config>, leave Program Files alone! */
-- 
-2.14.3
-
+ 		return ZOITECHATLIBDIR;
+	}
+ }
+ 
+ void
--- a/flatpak/net.zoite.Zoitechat.json
+++ b/flatpak/net.zoite.Zoitechat.json
@@ -1,82 +0,0 @@
-{
-  "app-id": "net.zoite.Zoitechat",
-  "branch": "master",
-  "runtime": "org.gnome.Platform",
-  "runtime-version": "49",
-  "sdk": "org.gnome.Sdk",
-  "command": "zoitechat",
-  "finish-args": [
-    "--share=ipc",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--share=network",
-    "--socket=pulseaudio",
-    "--filesystem=xdg-download",
-    "--filesystem=xdg-data/themes:ro",
-    "--filesystem=xdg-data/icons:ro",
-    "--filesystem=xdg-run/tray-icon:create",
-    "--env=GTK_CSD=1",
-    "--talk-name=org.freedesktop.Notifications",
-    "--talk-name=org.kde.StatusNotifierWatcher",
-    "--talk-name=com.canonical.AppMenu.Registrar",
-    "--talk-name=org.mpris.MediaPlayer2.*"
-  ],
-  "add-extensions": {
-    "net.zoite.Zoitechat.Plugin": {
-      "version": "49",
-      "directory": "extensions",
-      "add-ld-path": "lib",
-      "merge-dirs": "lib/zoitechat/plugins",
-      "subdirectories": true,
-      "no-autodownload": true,
-      "autodelete": true
-    }
-  },
-  "modules": [
-    "shared-modules/lua5.4/lua-5.4.json",
-    "shared-modules/libcanberra/libcanberra.json",
-    "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json",
-    "python3-cffi.json",
-    "perl.json",
-    {
-      "name": "lgi",
-      "buildsystem": "meson",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/pavouk/lgi/archive/c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a.tar.gz",
-          "sha256": "db67b2b7ee89fa566f783486d56be7203552a997bc55f35020b57dd2776b9943"
-        }
-      ]
-    },
-    {
-      "name": "zoitechat",
-      "buildsystem": "meson",
-      "config-opts": [
-        "-Ddbus-service-use-appid=true",
-        "-Dwith-perl=perl",
-        "-Dwith-python=python3",
-        "-Dwith-lua=lua"
-      ],
-      "build-options": {
-        "cflags": "-Wno-error=missing-include-dirs"
-      },
-      "cleanup": [
-        "/share/man"
-      ],
-      "post-install": [
-        "install -d /app/extensions"
-      ],
-      "sources": [
-        {
-          "type": "dir",
-          "path": ".."
-        },
-        {
-          "type": "patch",
-          "path": "Load-plugins-from-Flatpak-extensions.patch"
-        }
-      ]
-    }
-  ]
-}
--- a/flatpak/org.zoitechat.ZoiteChat.json
+++ b/flatpak/org.zoitechat.ZoiteChat.json
@@ -0,0 +1,127 @@
+{
+  "app-id": "org.zoitechat.ZoiteChat",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "50",
+  "sdk": "org.gnome.Sdk",
+  "command": "zoitechat",
+  "finish-args": [
+    "--share=ipc",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--share=network",
+    "--socket=pulseaudio",
+    "--filesystem=xdg-download",
+    "--filesystem=xdg-run/tray-icon:create",
+    "--env=GTK_CSD=1",
+    "--talk-name=org.freedesktop.Notifications",
+    "--talk-name=org.kde.StatusNotifierWatcher",
+    "--talk-name=com.canonical.AppMenu.Registrar"
+  ],
+  "add-extensions": {
+    "org.zoitechat.ZoiteChat.Plugin": {
+      "version": "50",
+      "directory": "extensions",
+      "add-ld-path": "lib",
+      "merge-dirs": "lib/zoitechat/plugins",
+      "subdirectories": true,
+      "no-autodownload": true,
+      "autodelete": true
+    }
+  },
+  "modules": [
+    "shared-modules/lua5.4/lua-5.4.json",
+    "shared-modules/libcanberra/libcanberra.json",
+    "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json",
+    {
+      "name": "python3-cffi",
+      "buildsystem": "simple",
+      "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation"
+      ],
+      "sources": [
+        {
+          "type": "file",
+          "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz",
+          "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"
+        },
+        {
+          "type": "file",
+          "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz",
+          "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"
+        }
+      ]
+    },
+    {
+      "name": "perl",
+      "buildsystem": "simple",
+      "build-options": {
+        "no-debuginfo": true
+      },
+      "build-commands": [
+        "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none",
+        "make -j${FLATPAK_BUILDER_N_JOBS}",
+        "make install"
+      ],
+      "cleanup": [
+        "/share/man",
+        "/lib/perl5/*/*/CORE/*.a"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz",
+          "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb"
+        }
+      ]
+    },
+    {
+      "name": "lgi",
+      "buildsystem": "meson",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/pavouk/lgi/archive/c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a.tar.gz",
+          "sha256": "db67b2b7ee89fa566f783486d56be7203552a997bc55f35020b57dd2776b9943"
+        }
+      ]
+    },
+    {
+      "name": "zoitechat",
+      "buildsystem": "meson",
+      "config-opts": [
+        "-Ddbus-service-use-appid=true",
+        "-Dwith-perl=perl",
+        "-Dwith-python=python3",
+        "-Dwith-lua=lua"
+      ],
+      "build-options": {
+        "cflags": "-Wno-error=missing-include-dirs"
+      },
+      "cleanup": [
+        "/share/man"
+      ],
+      "post-install": [
+      "install -d /app/extensions"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/ZoiteChat/zoitechat.git",
+          "tag": "zoitechat-2.18.1",
+          "commit": "479f1649efa0e5b166a7c7c9d86214b42ec9f794"
+        },
+        {
+          "type": "file",
+          "url": "https://publicsuffix.org/list/public_suffix_list.dat",
+          "sha256": "6f7f7d9e8c68447f1c74095a12574b7fee46b0cd759c518a659aee0615d8e118",
+          "dest": "src/common",
+          "dest-filename": "public_suffix_list.dat"
+        },
+        {
+          "type": "patch",
+          "path": "Load-plugins-from-Flatpak-extensions.patch"
+        }
+      ]
+    }
+  ]
+}
--- a/flatpak/perl.json
+++ b/flatpak/perl.json
@@ -1,20 +0,0 @@
-{
-  "name": "perl",
-  "buildsystem": "simple",
-  "build-commands": [
-    "./Configure -des -Dprefix=/app -Dvendorprefix=/app -Duseshrplib -Dman1dir=none -Dman3dir=none",
-    "make -j${FLATPAK_BUILDER_N_JOBS}",
-    "make install"
-  ],
-  "cleanup": [
-    "/share/man",
-    "/lib/perl5/*/*/CORE/*.a"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://www.cpan.org/src/5.0/perl-5.42.2.tar.xz",
-      "sha256": "0a585eeb9e363c0f80482ddb3571625250c2c86aeb408853e8ea50805cfb14bb"
-    }
-  ]
-}
--- a/flatpak/python3-cffi.json
+++ b/flatpak/python3-cffi.json
@@ -1,19 +0,0 @@
-{
-    "name": "python3-cffi",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz",
-            "sha256": "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz",
-            "sha256": "1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"
-        }
-    ]
-}
--- a/meson.build
+++ b/meson.build
@@ -18,8 +18,6 @@ libgmodule_dep = dependency('gmodule-2.0')

 libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
                             required: get_option('libcanberra'))
-miniupnpc_dep = dependency('miniupnpc', version: '>= 2.0.0',
-                           required: get_option('miniupnpc'))
 dbus_dep = dependency('gio-2.0', required: get_option('dbus'))

 global_deps = []
@@ -42,7 +40,6 @@ config_h.set10('ENABLE_NLS', true)
 config_h.set('USE_OPENSSL', libssl_dep.found())
 config_h.set('USE_LIBCANBERRA', libcanberra_dep.found())
 config_h.set('USE_DBUS', dbus_dep.found())
-config_h.set('USE_MINIUPNPC', miniupnpc_dep.found())
 config_h.set('USE_PLUGIN', get_option('plugin'))
 config_h.set('USE_GTK_FRONTEND', get_option('gtk-frontend'))

@@ -186,7 +183,6 @@ if meson.version().version_compare('>= 0.55.0')
    'Plugin Support': get_option('plugin'),
    'DBus Support': dbus_dep.found(),
    'libcanberra': libcanberra_dep.found(),
-    'miniupnpc': miniupnpc_dep.found(),
  }, section: 'Features')

  summary({
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,9 +19,6 @@ option('dbus', type: 'feature', value: 'auto',
 option('libcanberra', type: 'feature', value: 'auto',
  description: 'Support for sound alerts, Unix only'
 )
-option('miniupnpc', type: 'feature', value: 'auto',
-  description: 'Support for DCC Universal Plug & Play, Unix only'
-)
 option('appindicator', type: 'feature', value: 'auto',
  description: 'Use Ayatana/AppIndicator-based tray backend for GTK frontend (non-Windows only)'
 )
--- a/packaging/manjaro/PKGBUILD
+++ b/packaging/manjaro/PKGBUILD
@@ -13,7 +13,6 @@ depends=(
  'iso-codes'
  'libayatana-appindicator'
  'libcanberra'
-  'miniupnpc'
  'lua'
  'openssl'
  'perl'
--- a/plugins/fishlim/fish.c
+++ b/plugins/fishlim/fish.c
@@ -91,13 +91,27 @@ static const signed char fish_unbase64[256] = {
 #include <openssl/provider.h>
 static OSSL_PROVIDER *legacy_provider;
 static OSSL_PROVIDER *default_provider;
+static OSSL_LIB_CTX *ossl_ctx;
 #endif

 int fish_init(void)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    legacy_provider = OSSL_PROVIDER_load(NULL, "legacy");
-    default_provider = OSSL_PROVIDER_load(NULL, "default");
+    ossl_ctx = OSSL_LIB_CTX_new();
+    if (!ossl_ctx)
+        return 0;
+
+    legacy_provider = OSSL_PROVIDER_load(ossl_ctx, "legacy");
+    if (!legacy_provider) {
+        fish_deinit();
+        return 0;
+    }
+
+    default_provider = OSSL_PROVIDER_load(ossl_ctx, "default");
+    if (!default_provider) {
+        fish_deinit();
+        return 0;
+    }
 #endif
    return 1;
 }
@@ -115,6 +129,10 @@ void fish_deinit(void)
        default_provider = NULL;
    }

+    if (ossl_ctx) {
+        OSSL_LIB_CTX_free(ossl_ctx);
+        ossl_ctx = NULL;
+    }
 #endif
 }

@@ -260,9 +278,7 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
        }

 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(NULL, "BF-CBC", NULL);
-        if (!cipher)
-            cipher = (EVP_CIPHER *) EVP_bf_cbc();
+        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-CBC", NULL);
 #else
        cipher = (EVP_CIPHER *) EVP_bf_cbc();
 #endif
@@ -270,9 +286,7 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
    } else if (mode == EVP_CIPH_ECB_MODE) {

 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(NULL, "BF-ECB", NULL);
-        if (!cipher)
-            cipher = (EVP_CIPHER *) EVP_bf_ecb();
+        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-ECB", NULL);
 #else
        cipher = (EVP_CIPHER *) EVP_bf_ecb();
 #endif
--- a/plugins/fishlim/plugin_zoitechat.c
+++ b/plugins/fishlim/plugin_zoitechat.c
@@ -421,7 +421,7 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
            zoitechat_commandf(ph, "quote NOTICE %s :DH1080_FINISH %s%s", sender, pub_key, (mode == FISH_CBC_MODE) ? " CBC" : "");
            g_free(pub_key);
        } else {
-            zoitechat_printf(ph, "Failed to generate keys");
+            zoitechat_print(ph, "Failed to generate keys");
            goto cleanup;
        }
    } else if (!strcmp (dh_message, "DH1080_FINISH")) {
@@ -446,7 +446,7 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
        zoitechat_printf(ph, "Stored new key for %s (%s)", sender, fish_modes[mode]);
        g_free(secret_key);
    } else {
-        zoitechat_printf(ph, "Failed to create secret key!");
+        zoitechat_print(ph, "Failed to create secret key!");
    }

 cleanup:
@@ -548,7 +548,7 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
    }

    if ((query_ctx && ctx_type != 3) || (!query_ctx && !irc_is_query(target))) {
-        zoitechat_printf(ph, "You can only exchange keys with individuals");
+        zoitechat_print(ph, "You can only exchange keys with individuals");
        return ZOITECHAT_EAT_ALL;
    }

@@ -560,7 +560,7 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {

        g_free(pub_key);
    } else {
-        zoitechat_printf(ph, "Failed to generate keys");
+        zoitechat_print(ph, "Failed to generate keys");
    }

    return ZOITECHAT_EAT_ALL;
@@ -577,7 +577,7 @@ static int handle_crypt_topic(char *word[], char *word_eol[], void *userdata) {
    GSList *encrypted_list;

    if (!*topic) {
-        zoitechat_printf(ph, "%s", usage_topic);
+        zoitechat_print(ph, usage_topic);
        return ZOITECHAT_EAT_ALL;
    }

@@ -624,7 +624,7 @@ static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata) {
    GSList *encrypted_list, *encrypted_item;

    if (!*target || !*notice) {
-        zoitechat_printf(ph, "%s", usage_notice);
+        zoitechat_print(ph, usage_notice);
        return ZOITECHAT_EAT_ALL;
    }

@@ -676,7 +676,7 @@ static int handle_crypt_msg(char *word[], char *word_eol[], void *userdata) {
    GSList *encrypted_list, *encrypted_item;

    if (!*target || !*message) {
-        zoitechat_printf(ph, "%s", usage_msg);
+        zoitechat_print(ph, usage_msg);
        return ZOITECHAT_EAT_ALL;
    }

@@ -805,15 +805,11 @@ int zoitechat_plugin_init(zoitechat_plugin *plugin_handle,
    zoitechat_hook_server_attrs(ph, "TOPIC", ZOITECHAT_PRI_NORM, handle_incoming, NULL);
    zoitechat_hook_server_attrs(ph, "332", ZOITECHAT_PRI_NORM, handle_incoming, NULL);

-    if (!fish_init()) {
-        zoitechat_printf(ph, "FiSHLiM failed to initialize crypto backend");
+    if (!fish_init())
        return 0;
-    }

-    if (!dh1080_init()) {
-        zoitechat_printf(ph, "FiSHLiM failed to initialize DH1080");
+    if (!dh1080_init())
        return 0;
-    }

    pending_exchanges = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);

--- a/readme.md
+++ b/readme.md
@@ -31,19 +31,12 @@
 <br />


-ZoiteChat is a GTK3 IRC client based on HexChat, available for Windows and UNIX-like operating systems.  
-
-Features include HexChat-compatible Python, Perl and Lua scripting support, a plugin API,
-multiple server/channel windows, spell checking, multiple authentication methods including SASL,
-and customizable notifications.
-
+ZoiteChat is an HexChat based IRC client for Windows and UNIX-like operating systems.  
 See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  
+For more information on ZoiteChat please read our [documentation](https://docs.zoitechat.org/):
+- [Downloads](https://zoitechat.org/download)

-For more information on ZoiteChat:
-
- [Main Documentation](https://docs.zoitechat.org/) and [FAQ](https://docs.zoitechat.org/en/latest/faq.html)
-
- [Downloads](https://zoitechat.org/download.php)
+- [Troubleshooting](troubleshooting.md)


 ---
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -447,7 +447,6 @@ const struct prefs vars[] =
 	{"gui_tab_layout", P_OFFINT (hex_gui_tab_layout), TYPE_INT},
 	{"gui_tab_closebuttons", P_OFFINT (hex_gui_tab_closebuttons), TYPE_BOOL},
 	{"gui_tab_middleclose", P_OFFINT (hex_gui_tab_middleclose), TYPE_BOOL},
-	{"gui_mouse_scroll_speed", P_OFFINT (hex_gui_mouse_scroll_speed), TYPE_INT},
 	{"gui_tab_newtofront", P_OFFINT (hex_gui_tab_newtofront), TYPE_INT},
 	{"gui_tab_pos", P_OFFINT (hex_gui_tab_pos), TYPE_INT},
 	{"gui_tab_scrollchans", P_OFFINT (hex_gui_tab_scrollchans), TYPE_BOOL},
@@ -549,10 +548,6 @@ const struct prefs vars[] =
 #endif
 	{"net_bind_host", P_OFFSET (hex_net_bind_host), TYPE_STR},
 	{"net_ping_timeout", P_OFFINT (hex_net_ping_timeout), TYPE_INT, zoitechat_reinit_timers},
-	{"net_lag_check", P_OFFINT (hex_net_lag_check), TYPE_INT, zoitechat_reinit_timers},
-	{"net_keepalive_idle", P_OFFINT (hex_net_keepalive_idle), TYPE_INT},
-	{"net_keepalive_interval", P_OFFINT (hex_net_keepalive_interval), TYPE_INT},
-	{"net_keepalive_count", P_OFFINT (hex_net_keepalive_count), TYPE_INT},
 	{"net_proxy_auth", P_OFFINT (hex_net_proxy_auth), TYPE_BOOL},
 	{"net_proxy_host", P_OFFSET (hex_net_proxy_host), TYPE_STR},
 	{"net_proxy_pass", P_OFFSET (hex_net_proxy_pass), TYPE_STR},
@@ -562,7 +557,6 @@ const struct prefs vars[] =
 	{"net_proxy_user", P_OFFSET (hex_net_proxy_user), TYPE_STR},
 	{"net_reconnect_delay", P_OFFINT (hex_net_reconnect_delay), TYPE_INT},
 	{"net_throttle", P_OFFINT (hex_net_throttle), TYPE_BOOL},
-	{"net_upnp", P_OFFINT (hex_net_upnp), TYPE_BOOL},

 	{"notify_timeout", P_OFFINT (hex_notify_timeout), TYPE_INT},
 	{"notify_whois_online", P_OFFINT (hex_notify_whois_online), TYPE_BOOL},
@@ -789,7 +783,6 @@ load_default_config(void)
 	prefs.hex_gui_tab_server = 1;
 	prefs.hex_gui_tab_sort = 1;
 	prefs.hex_gui_tab_scrollchans = 1;
-	prefs.hex_gui_mouse_scroll_speed = 10;
 	prefs.hex_gui_topicbar = 1;
 	prefs.hex_gui_transparency = 255;
 	prefs.hex_gui_tray = 1;
@@ -812,7 +805,6 @@ load_default_config(void)
 	prefs.hex_irc_whois_front = 1;
 	prefs.hex_net_auto_reconnect = 1;
 	prefs.hex_net_throttle = 1;
-	prefs.hex_net_upnp = 1;
 	prefs.hex_stamp_log = 1;
 	prefs.hex_stamp_text = 1;
 	prefs.hex_text_autocopy_text = 1;
@@ -866,10 +858,6 @@ load_default_config(void)
 	prefs.hex_irc_ban_type = 1;
 	prefs.hex_irc_join_delay = 5;
 	prefs.hex_net_ping_timeout = 60;
-	prefs.hex_net_lag_check = 60;
-	prefs.hex_net_keepalive_idle = 60;
-	prefs.hex_net_keepalive_interval = 20;
-	prefs.hex_net_keepalive_count = 3;
 	prefs.hex_net_reconnect_delay = 10;
 	prefs.hex_notify_timeout = 15;
 	prefs.hex_text_max_indent = 256;
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -74,7 +74,6 @@
    <ClCompile Include="sysinfo\win32\backend.c" />
    <ClCompile Include="text.c" />
    <ClCompile Include="tree.c" />
-    <ClCompile Include="upnp.c" />
    <ClCompile Include="url.c" />
    <ClCompile Include="userlist.c" />
    <ClCompile Include="util.c" />
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -190,9 +190,6 @@
    <ClCompile Include="tree.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="upnp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="url.c">
      <Filter>Source Files</Filter>
    </ClCompile>
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -57,7 +57,6 @@
 #include "text.h"
 #include "url.h"
 #include "zoitechatc.h"
-#include "upnp.h"

 /* Setting _FILE_OFFSET_BITS to 64 doesn't change lseek to use off64_t on Windows, so override lseek to the version that does */
 #if defined(WIN32) && (!defined(__MINGW32__) && !defined(__MINGW64__))
@@ -372,12 +371,6 @@ dcc_connect_sok (struct DCC *dcc)
 static void
 dcc_close (struct DCC *dcc, enum dcc_state dccstat, int destroy)
 {
-	if (dcc->port > 0)
-	{
-		if (prefs.hex_net_upnp)
-			upnp_rem_redir(dcc->port);
-	}
-
 	if (dcc->wiotag)
 	{
 		fe_input_remove (dcc->wiotag);
@@ -1718,8 +1711,6 @@ dcc_listen_init (struct DCC *dcc, session *sess)
 	set_blocking (dcc->sok);

 	dcc->iotag = fe_input_add (dcc->sok, FIA_READ|FIA_EX, dcc_accept, dcc);
-	if (prefs.hex_net_upnp)
-		upnp_add_redir(inet_ntoa(SAddr.sin_addr), dcc->port);

 	return TRUE;
 }
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -24,8 +24,7 @@ common_sources = [
  'tree.c',
  'url.c',
  'userlist.c',
-  'util.c',
-  'upnp.c'
+  'util.c'
 ]

 common_sysinfo_deps = []
@@ -116,10 +115,6 @@ if libssl_dep.found()
  common_deps += libssl_dep
 endif

-if miniupnpc_dep.found()
-  common_deps += miniupnpc_dep
-endif
-
 if dbus_dep.found()
  subdir('dbus')
  common_deps += zoitechat_dbus_dep
--- a/src/common/network.c
+++ b/src/common/network.c
@@ -34,9 +34,6 @@

 #ifndef WIN32
 #include <unistd.h>
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #endif

 #define WANTSOCKET
@@ -46,9 +43,6 @@

 #define NETWORK_PRIVATE
 #include "network.h"
-#include "zoitechat.h"
-
-extern struct zoitechatprefs prefs;

 #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n)))

@@ -64,27 +58,6 @@ net_set_socket_options (int sok)
 	setsockopt (sok, SOL_SOCKET, SO_REUSEADDR, (char *) &sw, sizeof (sw));
 	sw = 1;
 	setsockopt (sok, SOL_SOCKET, SO_KEEPALIVE, (char *) &sw, sizeof (sw));
-#ifdef TCP_KEEPIDLE
-	{
-		int keepidle = prefs.hex_net_keepalive_idle;
-		if (keepidle > 0)
-			setsockopt (sok, IPPROTO_TCP, TCP_KEEPIDLE, (char *) &keepidle, sizeof (keepidle));
-	}
-#endif
-#ifdef TCP_KEEPINTVL
-	{
-		int keepintvl = prefs.hex_net_keepalive_interval;
-		if (keepintvl > 0)
-			setsockopt (sok, IPPROTO_TCP, TCP_KEEPINTVL, (char *) &keepintvl, sizeof (keepintvl));
-	}
-#endif
-#ifdef TCP_KEEPCNT
-	{
-		int keepcnt = prefs.hex_net_keepalive_count;
-		if (keepcnt > 0)
-			setsockopt (sok, IPPROTO_TCP, TCP_KEEPCNT, (char *) &keepcnt, sizeof (keepcnt));
-	}
-#endif
 }

 char *
--- a/src/common/upnp.c
+++ b/src/common/upnp.c
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) Thomas Bernard
- * Copyright (C) HexChat contributors
- * Copyright (C) ZoiteChat contributors
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "upnp.h"
-
-#ifdef USE_MINIUPNPC
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
-#include <miniupnpc/upnperrors.h>
-
-static struct UPNPUrls urls;
-static struct IGDdatas data;
-static int ready;
-static char upnp_lanaddr[64];
-
-void
-upnp_init(void)
-{
-	int err = 0;
-	int igd = 0;
-	char lanaddr[64] = {0};
-	struct UPNPDev *devlist;
-
-	memset(&urls, 0, sizeof(urls));
-	memset(&data, 0, sizeof(data));
-	ready = 0;
-	upnp_lanaddr[0] = 0;
-
-	devlist = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &err);
-	if (!devlist)
-		devlist = upnpDiscover(2000, NULL, NULL, 0, 1, 2, &err);
-	if (!devlist)
-		return;
-
-	igd = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
-	if (igd == 1 || igd == 2 || igd == 3)
-	{
-		ready = 1;
-		snprintf(upnp_lanaddr, sizeof(upnp_lanaddr), "%s", lanaddr);
-	}
-
-	freeUPNPDevlist(devlist);
-}
-
-void
-upnp_add_redir(const char *addr, int port)
-{
-	char port_str[16];
-	const char *map_addr;
-	int r;
-
-	if (!ready)
-		upnp_init();
-	if (!ready)
-		return;
-
-	map_addr = upnp_lanaddr[0] ? upnp_lanaddr : addr;
-	if (!map_addr || !map_addr[0])
-		return;
-
-	snprintf(port_str, sizeof(port_str), "%d", port);
-	r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
-		port_str, port_str, NULL, "zoitechat", "TCP", NULL, NULL);
-	if (r != UPNPCOMMAND_SUCCESS)
-		r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
-			port_str, port_str, map_addr, "zoitechat", "TCP", NULL, NULL);
-	if (r != UPNPCOMMAND_SUCCESS)
-		return;
-}
-
-void
-upnp_rem_redir(int port)
-{
-	char port_str[16];
-
-	if (!ready)
-		upnp_init();
-	if (!ready)
-		return;
-
-	snprintf(port_str, sizeof(port_str), "%d", port);
-	UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port_str, "TCP", NULL);
-}
-
-#else
-
-void
-upnp_init(void)
-{
-}
-
-void
-upnp_add_redir(const char *addr, int port)
-{
-	(void)addr;
-	(void)port;
-}
-
-void
-upnp_rem_redir(int port)
-{
-	(void)port;
-}
-
-#endif
--- a/src/common/upnp.h
+++ b/src/common/upnp.h
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) Thomas Bernard
- * Copyright (C) HexChat contributors
- * Copyright (C) ZoiteChat contributors
- */
-
-#ifndef ZOITECHAT_UPNP_H
-#define ZOITECHAT_UPNP_H
-
-void upnp_init(void);
-void upnp_add_redir(const char *addr, int port);
-void upnp_rem_redir(int port);
-
-#endif
--- a/src/common/zoitechat.c
+++ b/src/common/zoitechat.c
@@ -54,7 +54,6 @@
 #include "text.h"
 #include "url.h"
 #include "zoitechatc.h"
-#include "upnp.h"

 #if ! GLIB_CHECK_VERSION (2, 36, 0)
 #include <glib-object.h>			/* for g_type_init() */
@@ -380,7 +379,6 @@ lag_check (void)
 	char tbuf[128];
 	time_t now = time (0);
 	time_t lag;
-	time_t ping_age;

 	tim = make_ping_time ();

@@ -390,7 +388,7 @@ lag_check (void)
 		if (serv->connected && serv->end_of_motd)
 		{
 			lag = now - serv->ping_recv;
-			if (serv->lag_sent && prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
+			if (prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
 			{
 				sprintf (tbuf, "%" G_GINT64_FORMAT, (gint64) lag);
 				EMIT_SIGNAL (XP_TE_PINGTIMEOUT, serv->server_session, tbuf, NULL,
@@ -400,11 +398,11 @@ lag_check (void)
 			}
 			else
 			{
-				ping_age = now - serv->ping_recv;
-				if (!serv->lag_sent && prefs.hex_net_lag_check > 0 && ping_age >= prefs.hex_net_lag_check)
+				g_snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
+				serv->p_ping (serv, "", tbuf);
+				
+				if (!serv->lag_sent)
 				{
-					g_snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
-					serv->p_ping (serv, "", tbuf);
 					serv->lag_sent = tim;
 					fe_set_lag (serv, -1);
 				}
@@ -527,7 +525,7 @@ zoitechat_reinit_timers (void)
 	if ((prefs.hex_net_ping_timeout != 0 || prefs.hex_gui_lagometer)
 	    && lag_check_tag == 0)
 	{
-		lag_check_tag = fe_timeout_add_seconds (1, zoitechat_lag_check, NULL);
+		lag_check_tag = fe_timeout_add_seconds (30, zoitechat_lag_check, NULL);
 	}
 	else if ((!prefs.hex_net_ping_timeout && !prefs.hex_gui_lagometer)
 					 && lag_check_tag != 0)
@@ -962,8 +960,6 @@ xchat_init (void)
 	sound_load ();
 	notify_load ();
 	ignore_load ();
-	if (prefs.hex_net_upnp)
-		upnp_init ();
 	sts_init ();

 	g_snprintf (buf, sizeof (buf),
--- a/src/common/zoitechat.h
+++ b/src/common/zoitechat.h
@@ -202,7 +202,6 @@ struct zoitechatprefs
 	unsigned int hex_net_auto_reconnectonfail;
 	unsigned int hex_net_proxy_auth;
 	unsigned int hex_net_throttle;
-	unsigned int hex_net_upnp;
 	unsigned int hex_notify_whois_online;
 	unsigned int hex_perl_warnings;
 	unsigned int hex_stamp_log;
@@ -268,7 +267,6 @@ struct zoitechatprefs
 	int hex_gui_tab_layout;
 	int hex_gui_tab_closebuttons;
 	int hex_gui_tab_middleclose;
-	int hex_gui_mouse_scroll_speed;
 	int hex_gui_tab_newtofront;
 	int hex_gui_tab_pos;
 	int hex_gui_tab_small;
@@ -291,10 +289,6 @@ struct zoitechatprefs
 	int hex_irc_join_delay;
 	int hex_irc_notice_pos;
 	int hex_net_ping_timeout;
-	int hex_net_lag_check;
-	int hex_net_keepalive_idle;
-	int hex_net_keepalive_interval;
-	int hex_net_keepalive_count;
 	int hex_net_proxy_port;
 	int hex_net_proxy_type;				/* 0=disabled, 1=wingate 2=socks4, 3=socks5, 4=http */
 	int hex_net_proxy_use;				/* 0=all 1=IRC_ONLY 2=DCC_ONLY */
--- a/src/fe-gtk/chanview-tabs.c
+++ b/src/fe-gtk/chanview-tabs.c
@@ -305,14 +305,12 @@ static gboolean
 tab_scroll_cb (GtkWidget *widget, GdkEventScroll *event, gpointer cv)
 {
 	int direction = cv_scroll_direction (event);
-	int i;

 	if (prefs.hex_gui_tab_scrollchans)
 	{
 		if (direction != 0)
 		{
-			for (i = 0; i < cv_scroll_step_count (); i++)
-				mg_switch_page (1, direction);
+			mg_switch_page (1, direction);
 			return TRUE;
 		}
 	}
@@ -320,14 +318,12 @@ tab_scroll_cb (GtkWidget *widget, GdkEventScroll *event, gpointer cv)
 	{
 		if (direction < 0)
 		{
-			for (i = 0; i < cv_scroll_step_count (); i++)
-				tab_scroll_left_up_clicked (widget, cv);
+			tab_scroll_left_up_clicked (widget, cv);
 			return TRUE;
 		}
 		else if (direction > 0)
 		{
-			for (i = 0; i < cv_scroll_step_count (); i++)
-				tab_scroll_right_down_clicked (widget, cv);
+			tab_scroll_right_down_clicked (widget, cv);
 			return TRUE;
 		}
 	}
--- a/src/fe-gtk/chanview-tree.c
+++ b/src/fe-gtk/chanview-tree.c
@@ -112,11 +112,9 @@ cv_tree_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer user
 	if (prefs.hex_gui_tab_scrollchans)
 	{
 		int direction = cv_scroll_direction (event);
-		int i;

 		if (direction != 0)
-			for (i = 0; i < cv_scroll_step_count (); i++)
-				mg_switch_page (1, direction);
+			mg_switch_page (1, direction);

 		return direction != 0;
 	}
--- a/src/fe-gtk/chanview.c
+++ b/src/fe-gtk/chanview.c
@@ -126,15 +126,6 @@ cv_scroll_direction (GdkEventScroll *event)
 	}
 }

-static int
-cv_scroll_step_count (void)
-{
-	int speed = prefs.hex_gui_mouse_scroll_speed;
-	if (speed < 1)
-		speed = 1;
-	return (speed + 9) / 10;
-}
-

 /* ======= TABS ======= */

--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -320,7 +320,7 @@ fe_args (int argc, char *argv[])
 	GError *error = NULL;
 	GOptionContext *context;
 	char *buffer;
-	const char *desktop_id = "net.zoite.Zoitechat";
+	const char *desktop_id = "org.zoitechat.ZoiteChat";
 #ifdef WIN32
 	char *base_path = NULL;
 	char *locale_path = NULL;
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -2705,6 +2705,7 @@ mg_changui_destroy (session *sess)
                /* it fixes: Gdk-CRITICAL **: gdk_colormap_get_screen: */
                /*           assertion `GDK_IS_COLORMAP (cmap)' failed */
                ret = sess->gui->window;
+                g_free (sess->gui);
                sess->gui = NULL;
        }
        return ret;
@@ -2726,17 +2727,13 @@ mg_link_irctab (session *sess, int focus)
                return;
        }

-        session_gui *old_gui;
-
        mg_unpopulate (sess);
-        old_gui = sess->gui;
        win = mg_changui_destroy (sess);
        mg_changui_new (sess, sess->res, 1, focus);
        /* the buffer is now attached to a different widget */
        ((xtext_buffer *)sess->res->buffer)->xtext = (GtkXText *)sess->gui->xtext;
        if (win)
                gtk_widget_destroy (win);
-        g_free (old_gui);
 }

 void
--- a/src/fe-gtk/notifications/notification-freedesktop.c
+++ b/src/fe-gtk/notifications/notification-freedesktop.c
@@ -56,7 +56,7 @@ notification_backend_show (const char *title, const char *text)
    g_variant_builder_init (&params, G_VARIANT_TYPE ("(susssasa{sv}i)"));
    g_variant_builder_add (&params, "s", "zoitechat"); /* App name */
    g_variant_builder_add (&params, "u", 0); /* ID, 0 means don't replace */
-    g_variant_builder_add (&params, "s", "net.zoite.Zoitechat"); /* App icon */
+    g_variant_builder_add (&params, "s", "org.zoitechat.ZoiteChat"); /* App icon */
    g_variant_builder_add (&params, "s", title);
    g_variant_builder_add (&params, "s", text);
    g_variant_builder_add (&params, "as", NULL); /* Actions */
@@ -65,7 +65,7 @@ notification_backend_show (const char *title, const char *text)
    g_variant_builder_open (&params, G_VARIANT_TYPE ("a{sv}"));
    g_variant_builder_open (&params, G_VARIANT_TYPE ("{sv}"));
    g_variant_builder_add (&params, "s", "desktop-entry");
-    g_variant_builder_add (&params, "v", g_variant_new_string ("net.zoite.Zoitechat"));
+    g_variant_builder_add (&params, "v", g_variant_new_string ("org.zoitechat.ZoiteChat"));
    g_variant_builder_close (&params);
    g_variant_builder_close (&params);

--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -80,7 +80,7 @@ typedef GIcon *TrayIcon;
 typedef GIcon *TrayCustomIcon;
 #define tray_icon_free(i) g_object_unref(i)

-#define ICON_NORMAL_NAME "net.zoite.Zoitechat"
+#define ICON_NORMAL_NAME "org.zoitechat.ZoiteChat"
 #define ICON_MSG_NAME "mail-unread"
 #define ICON_HILIGHT_NAME "dialog-warning"
 #define ICON_FILE_NAME "folder-download"
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -193,7 +193,6 @@ static const setting appearance_advanced_settings[] =
        {ST_HEADER,     N_("Advanced"),0,0,0},
        {ST_EFILE, N_ ("Background image:"), P_OFFSETNL (hex_text_background), 0, 0, sizeof prefs.hex_text_background},
        {ST_HSCALE, N_("Window opacity:"), P_OFFINTNL(hex_gui_transparency),0,0,0},
-        {ST_HSCALE, N_("Mouse wheel scroll speed (Slower ← → Faster):"), P_OFFINTNL(hex_gui_mouse_scroll_speed), 0, 0, 100},

        {ST_END, 0, 0, 0, 0, 0}
 };
@@ -583,7 +582,6 @@ static const setting advanced_settings[] =
        {ST_TOGGLE,     N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0},
        {ST_TOGGLE,     N_("Use server time if supported"), P_OFFINTNL(hex_irc_cap_server_time), N_("Display timestamps obtained from server if it supports the time-server extension."), 0, 0},
        {ST_TOGGLE,     N_("Automatically reconnect to servers on disconnect"), P_OFFINTNL(hex_net_auto_reconnect), 0, 0, 1},
-        {ST_NUMBER,     N_("Lag check interval:"), P_OFFINTNL(hex_net_lag_check), 0, (const char **)N_("seconds."), 9999},
        {ST_NUMBER,     N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999},
        {ST_NUMBER,     N_("Auto join delay:"), P_OFFINTNL(hex_irc_join_delay), 0, 0, 9999},
        {ST_MENU,       N_("Ban Type:"), P_OFFINTNL(hex_irc_ban_type), N_("Attempt to use this banmask when banning or quieting. (requires irc_who_join)"), bantypemenu, 0},
@@ -650,18 +648,13 @@ static const setting network_settings[] =
        {ST_NUMBER,     N_("First DCC listen port:"), P_OFFINTNL(hex_dcc_port_first), 0, 0, 65535},
        {ST_NUMBER,     N_("Last DCC listen port:"), P_OFFINTNL(hex_dcc_port_last), 0, 
                (const char **)N_("!Leave ports at zero for full range."), 65535},
-        {ST_TOGGLE, N_("Enable UPnP port mapping for DCC"), P_OFFINTNL(hex_net_upnp), 0, 0, 0},
+
        {ST_HEADER,     N_("Proxy Server"), 0, 0, 0, 0},
        {ST_ENTRY,      N_("Hostname:"), P_OFFSETNL(hex_net_proxy_host), 0, 0, sizeof prefs.hex_net_proxy_host},
        {ST_NUMBER,     N_("Port:"), P_OFFINTNL(hex_net_proxy_port), 0, 0, 65535},
        {ST_MENU,       N_("Type:"), P_OFFINTNL(hex_net_proxy_type), 0, proxytypes, 0},
        {ST_MENU,       N_("Use proxy for:"), P_OFFINTNL(hex_net_proxy_use), 0, proxyuse, 0},

-        {ST_HEADER,     N_("Connection Health"), 0, 0, 0, 0},
-        {ST_NUMBER,     N_("TCP keepalive idle:"), P_OFFINTNL(hex_net_keepalive_idle), 0, (const char **)N_("seconds."), 7200},
-        {ST_NUMBER,     N_("TCP keepalive interval:"), P_OFFINTNL(hex_net_keepalive_interval), 0, (const char **)N_("seconds."), 600},
-        {ST_NUMBER,     N_("TCP keepalive probes:"), P_OFFINTNL(hex_net_keepalive_count), 0, 0, 20},
-
        {ST_HEADER,     N_("Proxy Authentication"), 0, 0, 0, 0},
        {ST_TOGGLE,     N_("Use authentication (HTTP or SOCKS5 only)"), P_OFFINTNL(hex_net_proxy_auth), 0, 0, 0},
        {ST_ENTRY,      N_("Username:"), P_OFFSETNL(hex_net_proxy_user), 0, 0, sizeof prefs.hex_net_proxy_user},
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -2938,41 +2938,19 @@ gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 {
 	GtkXText *xtext = GTK_XTEXT (widget);
 	gfloat new_value;
-	gfloat step;
-	gdouble dx;
-	gdouble dy;
-	int direction = 0;
-	int speed = prefs.hex_gui_mouse_scroll_speed;

-	if (speed < 1)
-		speed = 1;
-	step = (xtext_adj_get_page_increment (xtext->adj) * speed) / 100.0f;
-
-	if (event->direction == GDK_SCROLL_SMOOTH &&
-		gdk_event_get_scroll_deltas ((GdkEvent *)event, &dx, &dy))
-	{
-		if (dy > 0)
-			direction = 1;
-		else if (dy < 0)
-			direction = -1;
-	}
-	else if (event->direction == GDK_SCROLL_UP)
-		direction = -1;
-	else if (event->direction == GDK_SCROLL_DOWN)
-		direction = 1;
-
-	if (direction < 0)
+	if (event->direction == GDK_SCROLL_UP)		/* mouse wheel pageUp */
 	{
 		new_value = xtext_adj_get_value (xtext->adj) -
-			step;
+			(xtext_adj_get_page_increment (xtext->adj) / 10);
 		if (new_value < xtext_adj_get_lower (xtext->adj))
 			new_value = xtext_adj_get_lower (xtext->adj);
 		xtext_adj_set_value (xtext->adj, new_value);
 	}
-	else if (direction > 0)
+	else if (event->direction == GDK_SCROLL_DOWN)	/* mouse wheel pageDn */
 	{
 		new_value = xtext_adj_get_value (xtext->adj) +
-			step;
+			(xtext_adj_get_page_increment (xtext->adj) / 10);
 		if (new_value > (xtext_adj_get_upper (xtext->adj) -
 			xtext_adj_get_page_size (xtext->adj)))
 			new_value = xtext_adj_get_upper (xtext->adj) -
@@ -2980,7 +2958,7 @@ gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 		xtext_adj_set_value (xtext->adj, new_value);
 	}

-	return direction != 0;
+	return FALSE;
 }

 static void
Author	SHA1	Message	Date
deepend-tildeclub	57f8f97e59	fix syntax error	2026-05-22 01:55:53 -06:00
deepend-tildeclub	f0a0ea699d	Flatpak: missed changes to flatpak app id.	2026-05-22 01:35:49 -06:00
deepend-tildeclub	005d9c6849	Tighten Flatpak D-Bus permissions	2026-05-22 00:34:09 -06:00
deepend-tildeclub	115ac17968	Inline Flatpak deps, bump GNOME runtime to 50	2026-05-22 00:29:13 -06:00
deepend-tildeclub	d8600a2237	Prep Flatpak manifest for Flathub stable submission	2026-05-22 00:23:42 -06:00
deepend-tildeclub	6535810ca3	Rename app IDs to org.zoitechat.ZoiteChat	2026-05-22 00:08:54 -06:00