Merge pull request #366 from ZoiteChat/release/2.19-flatpak-error-startup

fix startup error on flatpak

.github/workflows/appimage-build.yml

@@ -2,7 +2,7 @@ name: AppImage Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/flatpak-build.yml

@@ -2,7 +2,7 @@ name: Flatpak Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/windows-build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 'release/**'
   pull_request:
     branches:
       - master

VERSION

@@ -0,0 +1 @@
+2.19.0

changelog.rst

@@ -1,6 +1,20 @@
 ZoiteChat ChangeLog
 =================
 
+2.19.0 (2026-07-28)
+-------------------
+
+- Added Python 3.8 compatibility for older Windows releases.
+- Added on-demand SASL password prompts, including renewed prompts after reconnecting.
+- Corrected NickServ authentication to use the decrypted password for the active network.
+- Made system theme matching the default and polished GTK3 theme integration.
+- Applied more settings changes immediately, reducing the need to restart ZoiteChat.
+- Added descriptive tooltips to the color picker choices and refined default text-event colors.
+- Stabilized channel tree font handling across palette and theme updates.
+- Corrected the chat scrollbar increment used by its arrow buttons.
+- Improved Windows URL launching through the native shell.
+- Restored expected minimize behavior when clicking ZoiteChat on the Windows taskbar.
+
 2.18.3 (2026-06-29)
 -------------------
 

data/misc/net.zoite.Zoitechat.appdata.xml.in

@@ -29,6 +29,22 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+<release date="2026-07-28" version="2.19.0">
+  <description>
+    <ul>
+      <li>Added Python 3.8 compatibility for older Windows releases.</li>
+      <li>Added on-demand SASL password prompts, including renewed prompts after reconnecting.</li>
+      <li>Corrected NickServ authentication to use the decrypted password for the active network.</li>
+      <li>Made system theme matching the default and polished GTK3 theme integration.</li>
+      <li>Applied more settings changes immediately, reducing the need to restart ZoiteChat.</li>
+      <li>Added descriptive tooltips to the color picker choices and refined default text-event colors.</li>
+      <li>Stabilized channel tree font handling across palette and theme updates.</li>
+      <li>Corrected the chat scrollbar increment used by its arrow buttons.</li>
+      <li>Improved Windows URL launching through the native shell.</li>
+      <li>Restored expected minimize behavior when clicking ZoiteChat on the Windows taskbar.</li>
+    </ul>
+  </description>
+</release>
 <release date="2026-06-29" version="2.18.3">
   <description>
     <ul>

meson.build

@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: '2.18.3',
+  version: run_command('cat', 'VERSION', check: true).stdout().strip(),
   meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',

packaging/fedora/zoitechat.spec

@@ -1,5 +1,5 @@
 Name:           zoitechat
-Version:        2.18.3
+Version:        %(cat VERSION)
 Release:        %autorelease
 Summary:        HexChat-based IRC client
 License:        GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception

plugins/python/meson.build

@@ -13,8 +13,16 @@ else
   python_dep = dependency(python_opt, version: '>= 2.7')
 endif
 
+python_py_conf = configuration_data()
+python_py_conf.set('VERSION', meson.project_version())
+python_py = configure_file(
+  input: 'python.py',
+  output: 'python.py',
+  configuration: python_py_conf
+)
+
 python3_source = custom_target('python-bindings',
-  input: ['../../src/common/zoitechat-plugin.h', 'python.py'],
+  input: ['../../src/common/zoitechat-plugin.h', python_py],
   output: 'python.c',
   command: [find_program('generate_plugin.py'), '@INPUT@', '@OUTPUT@']
 )

plugins/python/python.py

@@ -19,7 +19,7 @@ else:
 if not hasattr(sys, 'argv'):
     sys.argv = ['<zoitechat>']
 
-VERSION = b'2.18.3'
+VERSION = b'@VERSION@'
 PLUGIN_NAME = ffi.new('char[]', b'Python')
 PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
 PLUGIN_VERSION = ffi.new('char[]', VERSION)

src/common/dbus/meson.build

@@ -13,9 +13,9 @@ dbus_includes = [
 dbus_service_dir = join_paths(get_option('datadir'), 'dbus-1/services')
 
 if get_option('dbus-service-use-appid')
-  dbus_service_name = 'io.github.Hexchat'
-  dbus_output_file = 'io.github.Hexchat.service'
-  dbus_cargs = '-DDBUS_SERVICE="io.github.Hexchat"'
+  dbus_service_name = 'net.zoite.Zoitechat'
+  dbus_output_file = 'net.zoite.Zoitechat.service'
+  dbus_cargs = '-DDBUS_SERVICE="net.zoite.Zoitechat"'
 else
   dbus_service_name = 'org.zoitechat.service'
   dbus_output_file = 'org.zoitechat.service.service'

src/common/inbound.c

@@ -675,7 +675,8 @@ inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
 
 	if (fromme)
 	{
-		if (prefs.hex_away_auto_unmark && serv->is_away && !tags_data->timestamp)
+		if (prefs.hex_away_auto_unmark && serv->is_away &&
+			 (!tags_data->timestamp || serv->have_echo_message))
 			sess->server->p_set_back (sess->server);
 		reply_context_print (sess, tags_data);
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_UCHANMSG, sess, from, text, nickchar, NULL,

src/common/outbound.c

@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 									  newsess->server->nick, msg + offset, TRUE, FALSE,
 									  &no_tags);
 			}
-			else
+			else if (!sess->server->have_echo_message)
 			{
 				/* mask out passwords */
 				if (g_ascii_strcasecmp (nick, "nickserv") == 0)
@@ -5058,6 +5058,11 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
 		handle_say (sess, text, TRUE);
 		return 1;
 	}
+	if (text[0] == cmd_char && text[1] == cmd_char)
+	{
+		handle_say (sess, text + 1, TRUE);
+		return 1;
+	}
 
 	for (i = 1; text[i]; i++)
 	{

win32/version-template.ps1

@@ -1,6 +1,6 @@
 param ([string] $templateFilename, [string] $outputFilename)
 
-$versionParts = Select-String -Path "${env:SOLUTIONDIR}meson.build" -Pattern "  version: '([^']+)',$" | Select-Object -First 1 | %{ $_.Matches[0].Groups[1].Value.Split('.') }
+$versionParts = (Get-Content "${env:SOLUTIONDIR}VERSION" -Raw).Trim().Split('.')
 
 [string[]] $contents = Get-Content $templateFilename -Encoding UTF8 | %{
 	while ($_ -match '^(.*?)<#=(.*?)#>(.*?)$') {

win32/version.txt

@@ -1 +0,0 @@
-2.18.3