win32: Add files for appx building

This is quite sloppy but it should get the job done.

.github/workflows/flatpak-build.yml

@@ -1,7 +1,7 @@
 name: Flatpak Build
 on: [push, pull_request]
 jobs:
-  flatpak_build:
+  build:
     runs-on: ubuntu-latest
     container:
       image: bilelmoussaoui/flatpak-github-actions:gnome-40

.github/workflows/msys-build.yml

@@ -2,7 +2,7 @@ name: MSYS2 Build
 on: [push, pull_request]
 
 jobs:
-  msys2_build:
+  build:
     runs-on: windows-latest
     defaults:
       run:
@@ -19,7 +19,6 @@ jobs:
             mingw-w64-x86_64-python3-cffi
             mingw-w64-x86_64-meson
             mingw-w64-x86_64-gtk2
-            mingw-w64-x86_64-gtk-update-icon-cache
             mingw-w64-x86_64-luajit
             mingw-w64-x86_64-desktop-file-utils
 

.github/workflows/ubuntu-build.yml

@@ -1,7 +1,7 @@
 name: Ubuntu Build
 on: [push, pull_request]
 jobs:
-  ubuntu_build:
+  build:
     runs-on: ubuntu-20.04
 
     steps:

.github/workflows/windows-build.yml

@@ -2,7 +2,7 @@ name: Windows Build
 on: [push, pull_request]
 
 jobs:
-  windows_build:
+  build:
     runs-on: windows-2019
     strategy:
       matrix:
@@ -41,11 +41,11 @@ jobs:
           & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }}
 
           New-Item -Path "c:\gtk-build" -Name "python-2.7" -ItemType "Directory"
-          New-Item -Path "c:\gtk-build" -Name "python-3.8" -ItemType "Directory"
+          New-Item -Path "c:\gtk-build" -Name "python-3.6" -ItemType "Directory"
           New-Item -Path "c:\gtk-build\python-2.7" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/2.7.18/${{ matrix.arch }}"
-          New-Item -Path "c:\gtk-build\python-3.8" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/3.8.10/${{ matrix.arch }}"
+          New-Item -Path "c:\gtk-build\python-3.6" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}"
 
-          C:/hostedtoolcache/windows/Python/3.8.10/${{ matrix.arch }}/python.exe -m pip install cffi
+          C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}/python.exe -m pip install cffi
           C:/hostedtoolcache/windows/Python/2.7.18/${{ matrix.arch }}/python.exe -m pip install -qq cffi
         shell: powershell
 
@@ -55,9 +55,28 @@ jobs:
           msbuild win32\hexchat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
         shell: cmd
 
+      - name: Creating Appx
+        run: |
+          cp -r ..\hexchat-build\${{ matrix.platform }}\rel ..\hexchat-appx
+          .\win32\version-template.ps1 win32\AppxManifest.xml.in $(Join-Path $(Resolve-Path ..\hexchat-appx) AppxManifest.xml)
+          cd ..\hexchat-appx
+          rm plugins\hcperl.dll
+          rm plugins\hcpython2.dll
+          rm plugins\hcpython3.dll
+          rm plugins\hcupd.dll
+          rm -r python
+          rm *.pyd
+          rm WinSparkle.dll
+          rm portable-mode
+          rm hexchat-text.exe
+          rm thememan.exe
+          makeappx pack /d . /p hexchat-${{ matrix.arch }}.appx
+        shell: powershell
+
       - name: Preparing Artifacts
         run: |
           move ..\hexchat-build\${{ matrix.platform }}\HexChat*.exe .\
+          move ..\hexchat-appx\hexchat-${{ matrix.arch }}.appx .\
           move ..\hexchat-build .\
         shell: cmd
 
@@ -68,5 +87,10 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: Build Files ${{ matrix.arch  }}
+          name: Build Files ${{ matrix.arch }}
           path: hexchat-build
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Appx Files ${{ matrix.arch }}
+          path: hexchat-${{ matrix.arch }}.appx

data/icons/meson.build

@@ -1,11 +1,9 @@
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 install_data(
   'hexchat.png',
-  rename: 'io.github.Hexchat.png',
   install_dir: join_paths(icondir, '48x48/apps')
 )
 install_data(
   'hexchat.svg',
-  rename: 'io.github.Hexchat.svg',
   install_dir: join_paths(icondir, 'scalable/apps')
 )

data/misc/io.github.Hexchat.Plugin.metainfo.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>io.github.Hexchat.Plugin.@NAME@</id>
-  <extends>io.github.Hexchat</extends>
+  <extends>io.github.Hexchat.desktop</extends>
   <name>@NAME@ Plugin</name>
   <summary>@SUMMARY@</summary>
   <url type="homepage">https://hexchat.github.io/</url>

data/misc/io.github.Hexchat.appdata.xml.in

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>io.github.Hexchat</id>
+<component type="desktop">
+  <id>io.github.Hexchat.desktop</id>
   <name>HexChat</name>
-  <launchable type="desktop-id">io.github.Hexchat.desktop</launchable>
   <developer_name>HexChat</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
@@ -27,19 +26,6 @@
     <id>hexchat.desktop</id>
   </provides>
   <releases>
-    <release date="2022-02-12" version="2.16.1">
-      <description>
-        <p>This is a minor release with mostly bug-fixes:</p>
-        <ul>
-          <li>Add `-NOOVERRIDE` flag to the `GUI COLOR` command</li>
-          <li>Add `-q` (quiet) flag to the `EXECWRITE` command</li>
-          <li>Rename installed icon to match app-id (Fixes notification icon)</li>
-          <li>Fix escaping already escaped URLs when opening them</li>
-          <li>Fix Python scripts not being opened as UTF-8</li>
-          <li>Fix `TIMER` command supporting decimals regardless of locale</li>
-        </ul>
-      </description>
-    </release>
     <release date="2021-10-01" version="2.16.0">
       <description>
         <p>This is a feature release:</p>

data/misc/io.github.Hexchat.desktop.in.in

@@ -4,7 +4,7 @@ GenericName=IRC Client
 Comment=Chat with other people online
 Keywords=IM;Chat;
 Exec=@exec_command@
-Icon=io.github.Hexchat
+Icon=hexchat
 Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;

flatpak/io.github.Hexchat.json

@@ -5,6 +5,7 @@
   "runtime-version": "40",
   "sdk": "org.gnome.Sdk",
   "command": "hexchat",
+  "rename-icon": "hexchat",
   "finish-args": [
     "--share=ipc",
     "--socket=x11",
@@ -30,7 +31,7 @@
   "modules": [
     "shared-modules/gtk2/gtk2.json",
     "shared-modules/gtk2/gtk2-common-themes.json",
-    "shared-modules/dbus-glib/dbus-glib.json",
+    "shared-modules/dbus-glib/dbus-glib-0.110.json",
     "shared-modules/lua5.3/lua-5.3.5.json",
     "shared-modules/libcanberra/libcanberra.json",
     "python3-cffi.json",

meson.build

@@ -1,5 +1,5 @@
 project('hexchat', 'c',
-  version: '2.16.1',
+  version: '2.16.0',
   meson_version: '>= 0.47.0',
   default_options: [
     'c_std=gnu89',
@@ -34,7 +34,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'hexchat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
-config_h.set_quoted('G_LOG_DOMAIN', 'hexchat')
 config_h.set10('ENABLE_NLS', true)
 
 # Optional features

plugins/checksum/meson.build

@@ -3,5 +3,4 @@ shared_module('checksum', 'checksum.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'checksum.def',
 )

plugins/exec/meson.build

@@ -1,6 +1,5 @@
 shared_module('exec', 'exec.c',
   dependencies: hexchat_plugin_dep,
   install: true,
-  install_dir: plugindir,
-  vs_module_defs: 'exec.def',
+  install_dir: plugindir
 )

plugins/fishlim/fish.c

@@ -87,54 +87,6 @@ static const signed char fish_unbase64[256] = {
     dest |= (uint8_t)*((source)++); \
 } while (0);
 
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-#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
-    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;
-}
-
-void fish_deinit(void)
-{
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    if (legacy_provider) {
-        OSSL_PROVIDER_unload(legacy_provider);
-        legacy_provider = NULL;
-    }
-
-    if (default_provider) {
-        OSSL_PROVIDER_unload(default_provider);
-        default_provider = NULL;
-    }
-
-    if (ossl_ctx) {
-        OSSL_LIB_CTX_free(ossl_ctx);
-        ossl_ctx = NULL;
-    }
-#endif
-}
 
 /**
  * Encode ECB FiSH Base64
@@ -276,19 +228,9 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
             plaintext_len -= 8;
         }
 
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-CBC", NULL);
-#else
         cipher = (EVP_CIPHER *) EVP_bf_cbc();
-#endif
-
     } else if (mode == EVP_CIPH_ECB_MODE) {
-
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-ECB", NULL);
-#else
         cipher = (EVP_CIPHER *) EVP_bf_ecb();
-#endif
     }
 
     /* Zero Padding */

plugins/fishlim/fish.h

@@ -35,8 +35,6 @@ enum fish_mode {
   FISH_CBC_MODE = 0x2
 };
 
-int fish_init(void);
-void fish_deinit(void);
 char *fish_base64_encode(const char *message, size_t message_len);
 char *fish_base64_decode(const char *message, size_t *final_len);
 char *fish_encrypt(const char *key, size_t keylen, const char *message, size_t message_len, enum fish_mode mode);

plugins/fishlim/meson.build

@@ -19,5 +19,4 @@ shared_module('fishlim', fishlim_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'fishlim.def',
 )

plugins/fishlim/plugin_hexchat.c

@@ -815,9 +815,6 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
     hexchat_hook_server_attrs(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
     hexchat_hook_server_attrs(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
 
-    if (!fish_init())
-        return 0;
-
     if (!dh1080_init())
         return 0;
 
@@ -831,7 +828,6 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
 int hexchat_plugin_deinit(void) {
     g_clear_pointer(&pending_exchanges, g_hash_table_destroy);
     dh1080_deinit();
-    fish_deinit();
 
     hexchat_printf(ph, "%s plugin unloaded\n", plugin_name);
     return 1;

plugins/fishlim/tests/meson.build

@@ -12,5 +12,4 @@ fishlim_tests = executable('fishlim_tests', fishlim_test_sources,
 
 test('Fishlim Tests', fishlim_tests,
   protocol: 'tap',
-  timeout: 600,
 )

plugins/fishlim/tests/tests.c

@@ -21,7 +21,6 @@
 
 */
 
-#include <string.h>
 #include <glib.h>
 
 #include "fish.h"
@@ -130,17 +129,17 @@ static void
 test_base64_len (void)
 {
     char *b64 = NULL;
+    int i, message_len = 0;
     char message[1000];
-    int message_end = sizeof (message) - 1;
 
-    random_string(message, message_end);
-
-    for (; message_end >= 0; --message_end) {
-        message[message_end] = '\0'; /* Truncate instead of generating new strings */
-        b64 = g_base64_encode((const unsigned char *) message, message_end);
-        g_assert_nonnull(b64);
-        g_assert_cmpuint(strlen(b64), == , base64_len(message_end));
-        g_free(b64);
+    for (i = 0; i < 10; ++i) {
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = g_base64_encode((const unsigned char *) message, message_len);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , base64_len(message_len));
+            g_free(b64);
+        }
     }
 }
 
@@ -151,15 +150,18 @@ static void
 test_base64_fish_len (void)
 {
     char *b64 = NULL;
-    int message_len = 0;
+    int i, message_len = 0;
     char message[1000];
 
-    for (message_len = 1; message_len < 1000; ++message_len) {
-        random_string(message, message_len);
-        b64 = fish_base64_encode(message, message_len);
-        g_assert_nonnull(b64);
-        g_assert_cmpuint(strlen(b64), == , base64_fish_len(message_len));
-        g_free(b64);
+    for (i = 0; i < 10; ++i) {
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = fish_base64_encode(message, message_len);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , base64_fish_len(message_len));
+            g_free(b64);
+        }
     }
 }
 
@@ -240,28 +242,30 @@ test_foreach_utf8_data_chunks(void)
 {
     GRand *rand = NULL;
     GString *chunks = NULL;
-    int  max_chunks_len, chunks_len;
+    int tests, max_chunks_len, chunks_len;
     char ascii_message[1001];
     char *data_chunk = NULL;
 
     rand = g_rand_new();
-    max_chunks_len = g_rand_int_range(rand, 2, 301);
-    random_string(ascii_message, 1000);
 
-    data_chunk = ascii_message;
+    for (tests = 0; tests < 1000; ++tests) {
 
-    chunks = g_string_new(NULL);
+        max_chunks_len = g_rand_int_range(rand, 2, 301);
+        random_string(ascii_message, 1000);
 
-    while (foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
-        g_string_append(chunks, g_strndup(data_chunk, chunks_len));
-        /* Next chunk */
-        data_chunk += chunks_len;
+        data_chunk = ascii_message;
+
+        chunks = g_string_new(NULL);
+
+        while (foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
+            g_string_append(chunks, g_strndup(data_chunk, chunks_len));
+            /* Next chunk */
+            data_chunk += chunks_len;
+        }
+        /* Check data loss */
+        g_assert_cmpstr(chunks->str, == , ascii_message);
+        g_string_free(chunks, TRUE);
     }
-    /* Check data loss */
-    g_assert_cmpstr(chunks->str, == , ascii_message);
-
-    g_string_free(chunks, TRUE);
-    g_rand_free (rand);
 }
 
 int
@@ -278,8 +282,5 @@ main(int argc, char *argv[]) {
     g_test_add_func("/fishlim/max_text_command_len", test_max_text_command_len);
     g_test_add_func("/fishlim/foreach_utf8_data_chunks", test_foreach_utf8_data_chunks);
 
-    fish_init();
-    int ret = g_test_run();
-    fish_deinit();
-    return ret;
+    return g_test_run();
 }

plugins/fishlim/utils.c

@@ -22,8 +22,6 @@
 
 */
 
-#include <string.h>
-
 #include "utils.h"
 #include "fish.h"
 

plugins/lua/lua.c

@@ -957,21 +957,16 @@ static int api_hexchat_pluginprefs_meta_pairs(lua_State *L)
 	hexchat_plugin *h;
 
 	if(!script->name)
-
 		return luaL_error(L, "cannot use hexchat.pluginprefs before registering with hexchat.register");
 
 	dest = lua_newuserdata(L, 4096);
-
 	h = script->handle;
 	if(!hexchat_pluginpref_list(h, dest))
 		strcpy(dest, "");
 	lua_pushlightuserdata(L, dest);
 	lua_pushlightuserdata(L, dest);
 	lua_pushcclosure(L, api_hexchat_pluginprefs_meta_pairs_closure, 2);
-	lua_insert(L, -2); // Return the userdata (second return value from pairs),
-						// even though it's not used by the closure (first return
-						// value from pairs), so that Lua knows not to GC it.
-	return 2;
+	return 1;
 }
 
 static int api_attrs_meta_index(lua_State *L)
@@ -1769,3 +1764,4 @@ G_MODULE_EXPORT int hexchat_plugin_deinit(hexchat_plugin *plugin_handle)
 	g_clear_pointer(&expand_buffer, g_free);
 	return 1;
 }
+

plugins/perl/meson.build

@@ -88,5 +88,4 @@ shared_module('perl',
   install_dir: plugindir,
   install_rpath: perl_rpath,
   name_prefix: '',
-  vs_module_defs: 'perl.def',
 )

plugins/python/meson.build

@@ -28,5 +28,4 @@ shared_module('python', python3_source,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'python.def'
 )

plugins/python/python.py

@@ -146,8 +146,8 @@ class Plugin:
     def loadfile(self, filename):
         try:
             self.filename = filename
-            with open(filename, 'rb') as f:
-                data = f.read().decode('utf-8')
+            with open(filename, encoding='utf-8') as f:
+                data = f.read()
             compiled = compile_file(data, filename)
             exec(compiled, self.globals)
 
@@ -284,7 +284,7 @@ def _on_server_attrs_hook(word, word_eol, attrs, userdata):
 @ffi.def_extern()
 def _on_timer_hook(userdata):
     hook = ffi.from_handle(userdata)
-    if hook.callback(hook.userdata) == True:
+    if hook.callback(hook.userdata) is True:
         return 1
 
     hook.is_unload = True  # Don't unhook

plugins/sysinfo/meson.build

@@ -57,5 +57,4 @@ shared_module('sysinfo', sysinfo_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'sysinfo.def',
 )

plugins/upd/meson.build

@@ -5,5 +5,4 @@ shared_module('upd', 'upd.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'upd.def',
 )

plugins/winamp/meson.build

@@ -3,5 +3,4 @@ shared_module('winamp', 'winamp.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
-  vs_module_defs: 'winamp.def',
 )

src/common/cfgfiles.c

@@ -468,7 +468,6 @@ const struct prefs vars[] =
 	{"gui_win_fullscreen", P_OFFINT (hex_gui_win_fullscreen), TYPE_INT},
 	{"gui_win_left", P_OFFINT (hex_gui_win_left), TYPE_INT},
 	{"gui_win_modes", P_OFFINT (hex_gui_win_modes), TYPE_BOOL},
-	{"gui_win_nick", P_OFFINT (hex_gui_win_nick), TYPE_BOOL},
 	{"gui_win_save", P_OFFINT (hex_gui_win_save), TYPE_BOOL},
 	{"gui_win_state", P_OFFINT (hex_gui_win_state), TYPE_INT},
 	{"gui_win_swap", P_OFFINT (hex_gui_win_swap), TYPE_BOOL},
@@ -773,7 +772,6 @@ load_default_config(void)
 	prefs.hex_gui_ulist_count = 1;
 	prefs.hex_gui_ulist_icons = 1;
 	prefs.hex_gui_ulist_style = 1;
-	prefs.hex_gui_win_nick = 1;
 	prefs.hex_gui_win_save = 1;
 	prefs.hex_input_filter_beep = 1;
 	prefs.hex_input_flash_hilight = 1;

src/common/fe.h

@@ -69,16 +69,7 @@ int fe_input_add (int sok, int flags, void *func, void *data);
 void fe_input_remove (int tag);
 void fe_idle_add (void *func, void *data);
 void fe_set_topic (struct session *sess, char *topic, char *stripped_topic);
-typedef enum
-{
-	FE_COLOR_NONE = 0,
-	FE_COLOR_NEW_DATA = 1,
-	FE_COLOR_NEW_MSG = 2,
-	FE_COLOR_NEW_HILIGHT = 3,
-	FE_COLOR_FLAG_NOOVERRIDE = 8,
-} tabcolor;
-#define FE_COLOR_ALLFLAGS (FE_COLOR_FLAG_NOOVERRIDE)
-void fe_set_tab_color (struct session *sess, tabcolor col);
+void fe_set_tab_color (struct session *sess, int col);
 void fe_flash_window (struct session *sess);
 void fe_update_mode_buttons (struct session *sess, char mode, char sign);
 void fe_update_channel_key (struct session *sess);
@@ -141,7 +132,6 @@ void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
 #define FRF_EXTENSIONS 64		/* specify file extensions to be displayed */
 #define FRF_MIMETYPES 128		/* specify file mimetypes to be displayed */
-#define FRF_MODAL 256           /* dialog should be modal to parent */
 void fe_get_file (const char *title, char *initial,
 				 void (*callback) (void *userdata, char *file), void *userdata,
 				 int flags);

src/common/hexchat.h

@@ -150,7 +150,6 @@ struct hexchatprefs
 	unsigned int hex_gui_ulist_style;
 	unsigned int hex_gui_usermenu;
 	unsigned int hex_gui_win_modes;
-	unsigned int hex_gui_win_nick;
 	unsigned int hex_gui_win_save;
 	unsigned int hex_gui_win_swap;
 	unsigned int hex_gui_win_ucount;
@@ -502,7 +501,7 @@ typedef struct server
 	int joindelay_tag;				/* waiting before we send JOIN */
 	char hostname[128];				/* real ip number */
 	char servername[128];			/* what the server says is its name */
-	char password[1024];
+	char password[86];
 	char nick[NICKLEN];
 	char linebuf[8704];				/* RFC says 512 chars including \r\n, IRCv3 message tags add 8191, plus the NUL byte */
 	char *last_away_reason;

src/common/inbound.c

@@ -1474,17 +1474,10 @@ inbound_user_info (session *sess, char *chan, char *user, char *host,
 		for (list = sess_list; list; list = list->next)
 		{
 			sess = list->data;
-			if (sess->server != serv)
-				continue;
-
-			if (sess->type == SESS_CHANNEL)
+			if (sess->type == SESS_CHANNEL && sess->server == serv)
 			{
 				userlist_add_hostname (sess, nick, uhost, realname, servname, account, away);
 			}
-			else if (sess->type == SESS_DIALOG && uhost && !serv->p_cmp (sess->channel, nick))
-			{
-				set_topic (sess, uhost, uhost);
-			}
 		}
 	}
 
@@ -1735,7 +1728,6 @@ static const char * const supported_caps[] = {
 	"setname",
 	"invite-notify",
 	"account-tag",
-	"extended-monitor",
 
 	/* ZNC */
 	"znc.in/server-time-iso",
@@ -1937,24 +1929,7 @@ inbound_sasl_authenticate (server *serv, char *data)
 			return;
 		}
 
-		/* long SASL passwords must be split into 400-byte chunks
-		   https://ircv3.net/specs/extensions/sasl-3.1#the-authenticate-command */
-		size_t pass_len = strlen (pass);
-		if (pass_len <= 400)
-			tcp_sendf (serv, "AUTHENTICATE %s\r\n", pass);
-		else
-		{
-			size_t sent = 0;
-			while (sent < pass_len)
-			{
-				char *pass_chunk = g_strndup (pass + sent, 400);
-				tcp_sendf (serv, "AUTHENTICATE %s\r\n", pass_chunk);
-				sent += 400;
-				g_free (pass_chunk);
-			}
-		}
-		if (pass_len % 400 == 0)
-			tcp_sendf (serv, "AUTHENTICATE +\r\n");
+		tcp_sendf (serv, "AUTHENTICATE %s\r\n", pass);
 		g_free (pass);
 
 		

src/common/meson.build

@@ -47,6 +47,7 @@ if host_machine.system() == 'windows'
   ]
   common_sysinfo_deps += [
     cc.find_library('wbemuuid'), # sysinfo
+    cc.find_library('wbemcore'),
   ]
 
   common_sources += 'sysinfo/win32/backend.c'

src/common/modes.c

@@ -918,12 +918,8 @@ inbound_005 (server * serv, char *word[], const message_tags_data *tags_data)
 			server_set_encoding (serv, "UTF-8");
 		} else if (g_strcmp0 (tokname, "NAMESX") == 0)
 		{
-			if (tokadding && !serv->have_namesx)
-			{
-				/* only use protoctl if the server doesn't have the equivalent cap */
-				tcp_send_len (serv, "PROTOCTL NAMESX\r\n", 17);
-				serv->have_namesx = TRUE;
-			}
+									/* 12345678901234567 */
+			tcp_send_len (serv, "PROTOCTL NAMESX\r\n", 17);
 		} else if (g_strcmp0 (tokname, "WHOX") == 0)
 		{
 			serv->have_whox = tokadding;

src/common/notify.c

@@ -123,11 +123,7 @@ notify_save (void)
 {
 	int fh;
 	struct notify *notify;
-        // while reading the notify.conf file, elements are added by prepending to the
-        // list. reverse the list before writing to disk to keep the original
-        // order of the list
-        GSList *list = g_slist_copy(notify_list);
-        list = g_slist_reverse(list);
+	GSList *list = notify_list;
 
 	fh = hexchat_open_file ("notify.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
 	if (fh != -1)
@@ -146,7 +142,6 @@ notify_save (void)
 		}
 		close (fh);
 	}
-        g_slist_free(list);
 }
 
 void

src/common/outbound.c

@@ -1579,26 +1579,9 @@ cmd_execw (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		EMIT_SIGNAL (XP_TE_NOCHILD, sess, NULL, NULL, NULL, NULL, 0);
 		return FALSE;
 	}
-	if (strcmp (word[2], "--") == 0)
-	{
-		len = strlen(word_eol[3]);
-		temp = g_strconcat (word_eol[3], "\n", NULL);
-		PrintText(sess, temp);
-	}
-	else
-	{
-		if (strcmp (word[2], "-q") == 0)
-		{
-			len = strlen(word_eol[3]);
-			temp = g_strconcat (word_eol[3], "\n", NULL);
-		}
-		else
-		{
-			len = strlen(word_eol[2]);
-			temp = g_strconcat (word_eol[2], "\n", NULL);
-			PrintText(sess, temp);
-		}
-	}
+	len = strlen(word_eol[2]);
+	temp = g_strconcat (word_eol[2], "\n", NULL);
+	PrintText(sess, temp);
 	write(sess->running_exec->myfd, temp, len + 1);
 	g_free(temp);
 
@@ -2169,6 +2152,7 @@ cmd_gui (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	{
 	case 0x058b836e: fe_ctrl_gui (sess, 8, 0); break; /* APPLY */
 	case 0xac1eee45: fe_ctrl_gui (sess, 7, 2); break; /* ATTACH */
+	case 0x05a72f63: fe_ctrl_gui (sess, 4, atoi (word[3])); break; /* COLOR */
 	case 0xb06a1793: fe_ctrl_gui (sess, 7, 1); break; /* DETACH */
 	case 0x05cfeff0: fe_ctrl_gui (sess, 3, 0); break; /* FLASH */
 	case 0x05d154d8: fe_ctrl_gui (sess, 2, 0); break; /* FOCUS */
@@ -2182,12 +2166,6 @@ cmd_gui (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		else
 			return FALSE;
 		break;
-	case 0x05a72f63: /* COLOR */
-		if (!g_ascii_strcasecmp (word[4], "-NOOVERRIDE"))
-			fe_ctrl_gui (sess, 4, FE_COLOR_FLAG_NOOVERRIDE | atoi (word[3]));
-		else
-			fe_ctrl_gui (sess, 4, atoi (word[3]));
-		break;
 	default:
 		return FALSE;
 	}
@@ -3249,7 +3227,7 @@ cmd_reconnect (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		int offset = 0;
 
 #ifdef USE_OPENSSL
-		int use_ssl = TRUE;
+		int use_ssl = FALSE;
 		int use_ssl_noverify = FALSE;
 		if (g_strcmp0 (word[2], "-ssl") == 0)
 		{
@@ -3261,11 +3239,6 @@ cmd_reconnect (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 			use_ssl = TRUE;
 			use_ssl_noverify = TRUE;
 			offset++;	/* args move up by 1 word */
-		} else if (g_strcmp0 (word[2], "-insecure") == 0)
-		{
-			use_ssl = FALSE;
-			use_ssl_noverify = FALSE;
-			offset++;	/* args move up by 1 word */
 		}
 		serv->use_ssl = use_ssl;
 		serv->accept_invalid_cert = use_ssl_noverify;
@@ -3455,10 +3428,8 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	char *pass = NULL;
 	char *channel = NULL;
 	char *key = NULL;
-#ifdef USE_OPENSSL
-	int use_ssl = TRUE;
+	int use_ssl = FALSE;
 	int use_ssl_noverify = FALSE;
-#endif
 	int is_url = TRUE;
 	server *serv = sess->server;
 	ircnet *net = NULL;
@@ -3476,11 +3447,6 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		use_ssl_noverify = TRUE;
 		offset++;	/* args move up by 1 word */
 	}
-	else if (g_strcmp0 (word[2], "-insecure") == 0)
-	{
-		use_ssl = FALSE;
-		offset++;	/* args move up by 1 word */
-	}
 #endif
 
 	if (!parse_irc_url (word[2 + offset], &server_name, &port, &channel, &key, &use_ssl))
@@ -3521,13 +3487,6 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 		use_ssl = TRUE;
 #endif
 	}
-	else if (port[0] == '-')
-	{
-		port++;
-#ifdef USE_OPENSSL
-		use_ssl = FALSE;
-#endif
-	}
 
 	if (*pass)
 	{
@@ -3583,7 +3542,7 @@ cmd_servchan (struct session *sess, char *tbuf, char *word[],
 	int offset = 0;
 
 #ifdef USE_OPENSSL
-	if (g_strcmp0 (word[2], "-ssl") == 0 || g_strcmp0 (word[2], "-ssl-noverify") == 0 || g_strcmp0 (word[2], "-insecure") == 0)
+	if (g_strcmp0 (word[2], "-ssl") == 0 || g_strcmp0 (word[2], "-ssl-noverify") == 0)
 		offset++;
 #endif
 
@@ -3917,6 +3876,34 @@ cmd_wallchop (struct session *sess, char *tbuf, char *word[],
 	return TRUE;
 }
 
+static int
+cmd_wallchan (struct session *sess, char *tbuf, char *word[],
+				  char *word_eol[])
+{
+	GSList *list;
+
+	if (*word_eol[2])
+	{
+		list = sess_list;
+		while (list)
+		{
+			sess = list->data;
+			if (sess->type == SESS_CHANNEL)
+			{
+				message_tags_data no_tags = MESSAGE_TAGS_DATA_INIT;
+
+				inbound_chanmsg (sess->server, NULL, sess->channel,
+									  sess->server->nick, word_eol[2], TRUE, FALSE, 
+									  &no_tags);
+				sess->server->p_message (sess->server, sess->channel, word_eol[2]);
+			}
+			list = list->next;
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static int
 cmd_hop (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
@@ -4013,7 +4000,7 @@ const struct commands xc_cmds[] = {
 	 N_("EXECKILL [-9], kills a running exec in the current session. If -9 is given the process is SIGKILL'ed")},
 #ifndef __EMX__
 	{"EXECSTOP", cmd_execs, 0, 0, 1, N_("EXECSTOP, sends the process SIGSTOP")},
-	{"EXECWRITE", cmd_execw, 0, 0, 1, N_("EXECWRITE [-q|--], sends data to the processes stdin; use -q flag to quiet/suppress output at text box; use -- flag to stop interpreting arguments as flags, needed if -q itself would occur as data")},
+	{"EXECWRITE", cmd_execw, 0, 0, 1, N_("EXECWRITE, sends data to the processes stdin")},
 #endif
 #endif
 #if 0
@@ -4028,9 +4015,8 @@ const struct commands xc_cmds[] = {
 	{"GETINT", cmd_getint, 0, 0, 1, "GETINT <default> <command> <prompt>"},
 	{"GETSTR", cmd_getstr, 0, 0, 1, "GETSTR <default> <command> <prompt>"},
 	{"GHOST", cmd_ghost, 1, 0, 1, N_("GHOST <nick> [password], Kills a ghosted nickname")},
-	{"GUI", cmd_gui, 0, 0, 1, "GUI [APPLY|ATTACH|DETACH|SHOW|HIDE|FOCUS|FLASH|ICONIFY]\n"
-									  "       GUI [MSGBOX <text>|MENU TOGGLE]\n"
-									  "       GUI COLOR <n> [-NOOVERRIDE]"},
+	{"GUI", cmd_gui, 0, 0, 1, "GUI [APPLY|ATTACH|DETACH|SHOW|HIDE|FOCUS|FLASH|ICONIFY|COLOR <n>]\n"
+									  "       GUI [MSGBOX <text>|MENU TOGGLE]"},
 	{"HELP", cmd_help, 0, 0, 1, 0},
 	{"HOP", cmd_hop, 1, 1, 1,
 	 N_("HOP <nick>, gives chanhalf-op status to the nick (needs chanop)")},
@@ -4117,14 +4103,14 @@ const struct commands xc_cmds[] = {
 	{"SEND", cmd_send, 0, 0, 1, N_("SEND <nick> [<file>]")},
 #ifdef USE_OPENSSL
 	{"SERVCHAN", cmd_servchan, 0, 0, 1,
-	 N_("SERVCHAN [-insecure|-ssl|-ssl-noverify] <host> <port> <channel>, connects and joins a channel using ssl unless otherwise specified")},
+	 N_("SERVCHAN [-ssl|-ssl-noverify] <host> <port> <channel>, connects and joins a channel")},
 #else
 	{"SERVCHAN", cmd_servchan, 0, 0, 1,
 	 N_("SERVCHAN <host> <port> <channel>, connects and joins a channel")},
 #endif
 #ifdef USE_OPENSSL
 	{"SERVER", cmd_server, 0, 0, 1,
-	 N_("SERVER [-insecure|-ssl|-ssl-noverify] <host> [<port>] [<password>], connects to a server using ssl unless otherwise specified, the default port is 6697 for ssl connections and 6667 for insecure connections")},
+	 N_("SERVER [-ssl|-ssl-noverify] <host> [<port>] [<password>], connects to a server, the default port is 6667 for normal connections, and 6697 for ssl connections")},
 #else
 	{"SERVER", cmd_server, 0, 0, 1,
 	 N_("SERVER <host> [<port>] [<password>], connects to a server, the default port is 6667")},
@@ -4155,6 +4141,8 @@ const struct commands xc_cmds[] = {
 	{"USERLIST", cmd_userlist, 1, 1, 1, 0},
 	{"VOICE", cmd_voice, 1, 1, 1,
 	 N_("VOICE <nick>, gives voice status to someone (needs chanop)")},
+	{"WALLCHAN", cmd_wallchan, 1, 1, 1,
+	 N_("WALLCHAN <message>, writes the message to all channels")},
 	{"WALLCHOP", cmd_wallchop, 1, 1, 1,
 	 N_("WALLCHOP <message>, sends the message to all chanops on the current channel")},
 	{0, 0, 0, 0, 0, 0}

src/common/plugin-timer.c

@@ -198,7 +198,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 		offset += 2;
 	}
 
-	timeout = g_ascii_strtod (word[2 + offset], NULL);
+	timeout = atof (word[2 + offset]);
 	command = word_eol[3 + offset];
 
 	if (timeout < 0.1 || timeout * 1000 > INT_MAX || !command[0])

src/common/proto-irc.c

@@ -461,7 +461,7 @@ channel_date (session *sess, char *chan, char *timestr,
 }
 
 static int
-trailing_index(char *word_eol[])
+trailing_index(const char *word_eol[])
 {
 	int param_index;
 	for (param_index = 3; param_index < PDIWORDS; ++param_index)
@@ -627,7 +627,7 @@ process_numeric (session * sess, int n,
 	case 320:	/* :is an identified user */
 		if (!serv->skip_next_whois)
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS_ID, whois_sess, word[4],
-										  word_eol[5][0] == ':' ? word_eol[5] + 1 : word_eol[5], NULL, NULL, 0,
+										  word_eol[5] + 1, NULL, NULL, 0,
 										  tags_data->timestamp);
 		break;
 
@@ -920,14 +920,6 @@ process_numeric (session * sess, int n,
 		notify_set_online (serv, word[4], tags_data);
 		break;
 
-	case 524: // ERR_HELPNOTFOUND
-	case 704: // RPL_HELPSTART
-	case 705: // RPL_HELPTXT
-	case 706: // RPL_ENDOFHELP
-		EMIT_SIGNAL_TIMESTAMP (XP_TE_SERVTEXT, sess, STRIP_COLON(word, word_eol, 5), NULL, NULL, NULL,
-									  0, tags_data->timestamp);
-		break;
-
 	case 728:	/* +q-list entry */
 		/* NOTE:  FREENODE returns these results inconsistent with e.g. +b */
 		/* Who else has imlemented MODE_QUIET, I wonder? */

src/common/server.c

@@ -1559,7 +1559,7 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 	if (!hostname[0])
 		return;
 
-	if (port < 1 || port > 65535)
+	if (port < 0)
 	{
 		/* use default port for this server type */
 		port = 6667;
@@ -1567,8 +1567,8 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 		if (serv->use_ssl)
 			port = 6697;
 #endif
-		g_debug ("Attempted to connect to invalid port, assuming default port %d", port);
 	}
+	port &= 0xffff;	/* wrap around */
 
 	if (serv->connected || serv->connecting || serv->recondelay_tag)
 		server_disconnect (sess, TRUE, -1);

src/common/servlist.c

@@ -54,6 +54,8 @@ static const struct defaultserver def[] =
 	/* Invalid hostname in cert */
 	{0,			"irc.2600.net"},
 
+	{"ACN", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"global.acn.gr"},
 
 	{"AfterNET", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.afternet.org"},
@@ -185,12 +187,12 @@ static const struct defaultserver def[] =
 	{"Interlinked", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.interlinked.me"},
 
-	{"Irc-Nerds", 0, 0, 0, LOGIN_SASL, 0, TRUE},
-	{0,			"irc.irc-nerds.net"},
-	
 	{"IRC4Fun", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,				"irc.irc4fun.net"},
 
+	{"IRCHighWay", 0, 0, 0, 0, 0, TRUE},
+	{0,				"irc.irchighway.net"},
+
 	{"IRCNet",		0},
 	{0,				"open.ircnet.net"},
 

src/common/sysinfo/win32/backend.c

@@ -84,8 +84,7 @@ sysinfo_get_cpu_arch (void)
 
 	GetNativeSystemInfo (&si);
 
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
-		si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
 	{
 		return cpu_arch = 64;
 	}
@@ -107,8 +106,7 @@ sysinfo_get_build_arch (void)
 
 	GetSystemInfo (&si);
 
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64 ||
-		si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
 	{
 		return build_arch = 64;
 	}
@@ -356,8 +354,6 @@ static char *read_cpu_info (IWbemClassObject *object)
 
 	VariantClear (&max_clock_speed_variant);
 
-	g_strchomp (name_utf8);
-
 	if (cpu_freq_mhz > 1000)
 	{
 		result = g_strdup_printf ("%s (%.2fGHz)", name_utf8, cpu_freq_mhz / 1000.f);

src/common/util.c

@@ -1375,16 +1375,11 @@ str_sha256hash (char *string)
 	int i;
 	unsigned char hash[SHA256_DIGEST_LENGTH];
 	char buf[SHA256_DIGEST_LENGTH * 2 + 1];		/* 64 digit hash + '\0' */
-
-#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-	SHA256 (string, strlen (string), hash);
-#else
 	SHA256_CTX sha256;
 
 	SHA256_Init (&sha256);
 	SHA256_Update (&sha256, string, strlen (string));
 	SHA256_Final (hash, &sha256);
-#endif
 
 	for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
 	{

src/fe-gtk/chanlist.c

@@ -459,7 +459,7 @@ chanlist_join (GtkWidget * wid, server *serv)
 			g_snprintf (tbuf, sizeof (tbuf), "join %s", chan);
 			handle_command (serv->server_session, tbuf, FALSE);
 		} else
-			gdk_display_beep (gdk_display_get_default ());
+			gdk_beep ();
 		g_free (chan);
 	}
 }
@@ -512,7 +512,7 @@ chanlist_save (GtkWidget * wid, server *serv)
 	GtkTreeModel *model = GET_MODEL (serv);
 
 	if (gtk_tree_model_get_iter_first (model, &iter))
-		gtkutil_file_req (NULL, _("Select an output filename"), chanlist_filereq_done,
+		gtkutil_file_req (_("Select an output filename"), chanlist_filereq_done,
 								serv, NULL, NULL, FRF_WRITE);
 }
 
@@ -777,6 +777,7 @@ chanlist_opengui (server *serv, int do_refresh)
 	chanlist_add_column (view, COL_CHANNEL, 96, _("Channel"), FALSE);
 	chanlist_add_column (view, COL_USERS,   50, _("Users"),   TRUE);
 	chanlist_add_column (view, COL_TOPIC,   50, _("Topic"),   FALSE);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	/* this is a speed up, but no horizontal scrollbar :( */
 	/*gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (view), TRUE);*/
 	gtk_widget_show (view);

src/fe-gtk/dccgui.c

@@ -146,7 +146,7 @@ fe_dcc_send_filereq (struct session *sess, char *nick, int maxcps, int passive)
 	mdc->maxcps = maxcps;
 	mdc->passive = passive;
 
-	gtkutil_file_req (NULL, tbuf, dcc_send_filereq_file, mdc, prefs.hex_dcc_dir, NULL, FRF_MULTIPLE|FRF_FILTERISINITIAL);
+	gtkutil_file_req (tbuf, dcc_send_filereq_file, mdc, prefs.hex_dcc_dir, NULL, FRF_MULTIPLE|FRF_FILTERISINITIAL);
 
 	g_free (tbuf);
 }
@@ -812,6 +812,7 @@ fe_dcc_open_recv_win (int passive)
 										 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 										 G_TYPE_STRING, G_TYPE_POINTER, GDK_TYPE_COLOR);
 	view = gtkutil_treeview_new (vbox, GTK_TREE_MODEL (store), NULL, -1);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	/* Up/Down Icon column */
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), -1, NULL,
 																gtk_cell_renderer_pixbuf_new (),
@@ -1066,6 +1067,7 @@ fe_dcc_open_chat_win (int passive)
 	dcc_add_column (view, CCOL_START,  CCOL_COLOR, _("Start Time"), FALSE);
 
 	gtk_tree_view_column_set_expand (gtk_tree_view_get_column (GTK_TREE_VIEW (view), 1), TRUE);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 
 	dcccwin.list = view;
 	dcccwin.store = store;

src/fe-gtk/editlist.c

@@ -288,6 +288,8 @@ editlist_treeview_new (GtkWidget *box, char *title1, char *title2)
 	g_signal_connect (G_OBJECT (view), "key_press_event",
 						G_CALLBACK (editlist_keypress), NULL);
 
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
+
 	render = gtk_cell_renderer_text_new ();
 	g_object_set (render, "editable", TRUE, NULL);
 	g_signal_connect (G_OBJECT (render), "edited",

src/fe-gtk/fe-gtk.c

@@ -664,13 +664,13 @@ fe_print_text (struct session *sess, char *text, time_t stamp,
 		return;
 
 	if (sess == current_tab)
-		fe_set_tab_color (sess, FE_COLOR_NONE);
+		fe_set_tab_color (sess, 0);
 	else if (sess->tab_state & TAB_STATE_NEW_HILIGHT)
-		fe_set_tab_color (sess, FE_COLOR_NEW_HILIGHT);
+		fe_set_tab_color (sess, 3);
 	else if (sess->tab_state & TAB_STATE_NEW_MSG)
-		fe_set_tab_color (sess, FE_COLOR_NEW_MSG);
+		fe_set_tab_color (sess, 2);
 	else
-		fe_set_tab_color (sess, FE_COLOR_NEW_DATA);
+		fe_set_tab_color (sess, 1);
 }
 
 void
@@ -698,7 +698,7 @@ fe_beep (session *sess)
 
 	if (ca_context_play (ca_con, 0, CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0)
 #endif
-	gdk_display_beep (gdk_display_get_default ());
+	gdk_beep ();
 #endif
 }
 
@@ -903,7 +903,7 @@ fe_confirm (const char *message, void (*yesproc)(void *), void (*noproc)(void *)
 	if (dcc->file)
 	{
 		char *filepath = g_build_filename (prefs.hex_dcc_dir, dcc->file, NULL);
-		gtkutil_file_req (NULL, message, dcc_saveas_cb, ud, filepath, NULL,
+		gtkutil_file_req (message, dcc_saveas_cb, ud, filepath, NULL,
 								FRF_WRITE|FRF_NOASKOVERWRITE|FRF_FILTERISINITIAL);
 		g_free (filepath);
 	}
@@ -1054,46 +1054,6 @@ osx_show_uri (const char *url)
 
 #endif
 
-static inline char *
-escape_uri (const char *uri)
-{
-	return g_uri_escape_string(uri, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS, FALSE);
-}
-
-static inline gboolean
-uri_contains_forbidden_characters (const char *uri)
-{
-	while (*uri)
-	{
-		/* This is not an exhaustive list, the full URI has segments that allow characters like "[]:" for example. */
-		if (strchr ("`<> ${}\"+", *uri) != NULL || (*uri & 0x80) /* non-ascii */)
-			return TRUE;
-		uri++;
-	}
-
-	return FALSE;
-}
-
-static char *
-maybe_escape_uri (const char *uri)
-{
-	/* The only way to know if a string has already been escaped or not
-	 * is by fulling parsing each segement but we can try some more simple heuristics. */
-
-	/* If we find characters that should clearly be escaped. */
-	if (uri_contains_forbidden_characters (uri))
-		return escape_uri (uri);
-
-	/* If it fails to be unescaped then it was not escaped. */
-	char *unescaped = g_uri_unescape_string (uri, NULL);
-	if (!unescaped)
-		return escape_uri (uri);
-	g_free (unescaped);
-
-	/* At this point it is probably safe to pass through as-is. */
-	return g_strdup (uri);
-}
-
 static void
 fe_open_url_inner (const char *url)
 {
@@ -1111,8 +1071,8 @@ fe_open_url_inner (const char *url)
 #elif defined(__APPLE__)
     osx_show_uri (url);
 #else
-	char *escaped_url = maybe_escape_uri (url);
-	g_debug ("Opening URL \"%s\" (%s)", escaped_url, url);
+	char *escaped_url = g_uri_escape_string (url, G_URI_RESERVED_CHARS_GENERIC_DELIMITERS G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS,
+	                                         FALSE);
 	gtk_show_uri (NULL, escaped_url, GDK_CURRENT_TIME, NULL);
 	g_free (escaped_url);
 #endif
@@ -1216,7 +1176,7 @@ fe_get_file (const char *title, char *initial,
 {
 	/* OK: Call callback once per file, then once more with file=NULL. */
 	/* CANCEL: Call callback once with file=NULL. */
-	gtkutil_file_req (NULL, title, callback, userdata, initial, NULL, flags | FRF_FILTERISINITIAL);
+	gtkutil_file_req (title, callback, userdata, initial, NULL, flags | FRF_FILTERISINITIAL);
 }
 
 void

src/fe-gtk/fkeys.c

@@ -674,6 +674,8 @@ key_dialog_treeview_new (GtkWidget *box)
 	g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW(view))),
 					"changed", G_CALLBACK (key_dialog_selection_changed), NULL);
 
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
+
 	render = gtk_cell_renderer_accel_new ();
 	g_object_set (render, "editable", TRUE,
 #ifndef WIN32
@@ -892,7 +894,7 @@ key_save_kbs (void)
 #define STRIP_WHITESPACE \
 	while (buf[0] == ' ' || buf[0] == '\t') \
 		buf++; \
-	len = strlen (buf); \
+		len = strlen (buf); \
 	while (buf[len] == ' ' || buf[len] == '\t') \
 	{ \
 		buf[len] = 0; \

src/fe-gtk/gtkutil.c

@@ -190,7 +190,7 @@ gtkutil_file_req_response (GtkWidget *dialog, gint res, struct file_req *freq)
 }
 
 void
-gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *userdata, char *filter, char *extensions,
+gtkutil_file_req (const char *title, void *callback, void *userdata, char *filter, char *extensions,
 						int flags)
 {
 	struct file_req *freq;
@@ -269,16 +269,6 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
 							G_CALLBACK (gtkutil_file_req_response), freq);
 	g_signal_connect (G_OBJECT (dialog), "destroy",
 						   G_CALLBACK (gtkutil_file_req_destroy), (gpointer) freq);
-
-	if (parent)
-		gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-
-	if (flags & FRF_MODAL)
-	{
-		g_assert (parent);
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	}
-
 	gtk_widget_show (dialog);
 }
 

src/fe-gtk/gtkutil.h

@@ -25,7 +25,7 @@
 
 typedef void (*filereqcallback) (void *, char *file);
 
-void gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *userdata, char *filter, char *extensions, int flags);
+void gtkutil_file_req (const char *title, void *callback, void *userdata, char *filter, char *extensions, int flags);
 void gtkutil_destroy (GtkWidget * igad, GtkWidget * dgad);
 void gtkutil_destroy_on_esc (GtkWidget *win);
 GtkWidget *gtkutil_button (GtkWidget *box, char *stock, char *tip, void *callback,

src/fe-gtk/ignoregui.c

@@ -165,6 +165,7 @@ ignore_treeview_new (GtkWidget *box)
 	                             UNIGNORE_COLUMN, _("Unignore"),
 	                             -1);
 
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	gtk_tree_view_column_set_expand (gtk_tree_view_get_column (GTK_TREE_VIEW (view), 0), TRUE);
 
 	/* attach to signals and customise columns */

src/fe-gtk/maingui.c

@@ -175,26 +175,20 @@ fe_flash_window (session *sess)
 /* set a tab plain, red, light-red, or blue */
 
 void
-fe_set_tab_color (struct session *sess, tabcolor col)
+fe_set_tab_color (struct session *sess, int col)
 {
 	struct session *server_sess = sess->server->server_session;
-	int col_noflags = (col & ~FE_COLOR_ALLFLAGS);
-	int col_shouldoverride = !(col & FE_COLOR_FLAG_NOOVERRIDE);
-
 	if (sess->res->tab && sess->gui->is_tab && (col == 0 || sess != current_tab))
 	{
-		switch (col_noflags)
+		switch (col)
 		{
 		case 0:	/* no particular color (theme default) */
 			sess->tab_state = TAB_STATE_NONE;
 			chan_set_color (sess->res->tab, plain_list);
 			break;
 		case 1:	/* new data has been displayed (dark red) */
-			if (col_shouldoverride || !((sess->tab_state & TAB_STATE_NEW_MSG)
-										|| (sess->tab_state & TAB_STATE_NEW_HILIGHT))) {
-				sess->tab_state = TAB_STATE_NEW_DATA;
-				chan_set_color (sess->res->tab, newdata_list);
-			}
+			sess->tab_state = TAB_STATE_NEW_DATA;
+			chan_set_color (sess->res->tab, newdata_list);
 
 			if (chan_is_collapsed (sess->res->tab)
 				&& !((server_sess->tab_state & TAB_STATE_NEW_MSG)
@@ -207,10 +201,8 @@ fe_set_tab_color (struct session *sess, tabcolor col)
 
 			break;
 		case 2:	/* new message arrived in channel (light red) */
-			if (col_shouldoverride || !(sess->tab_state & TAB_STATE_NEW_HILIGHT)) {
-				sess->tab_state = TAB_STATE_NEW_MSG;
-				chan_set_color (sess->res->tab, newmsg_list);
-			}
+			sess->tab_state = TAB_STATE_NEW_MSG;
+			chan_set_color (sess->res->tab, newmsg_list);
 
 			if (chan_is_collapsed (sess->res->tab)
 				&& !(server_sess->tab_state & TAB_STATE_NEW_HILIGHT)
@@ -399,22 +391,27 @@ fe_set_title (session *sess)
 					 _(DISPLAY_NAME));
 		break;
 	case SESS_SERVER:
-		g_snprintf (tbuf, sizeof (tbuf), "%s%s%s - %s",
-					 prefs.hex_gui_win_nick ? sess->server->nick : "",
-					 prefs.hex_gui_win_nick ? " @ " : "", server_get_network (sess->server, TRUE),
+		g_snprintf (tbuf, sizeof (tbuf), "%s @ %s - %s",
+					 sess->server->nick, server_get_network (sess->server, TRUE),
 					 _(DISPLAY_NAME));
 		break;
 	case SESS_CHANNEL:
 		/* don't display keys in the titlebar */
+		if (prefs.hex_gui_win_modes)
+		{
 			g_snprintf (tbuf, sizeof (tbuf),
-					 "%s%s%s / %s%s%s%s - %s",
-					 prefs.hex_gui_win_nick ? sess->server->nick : "",
-					 prefs.hex_gui_win_nick ? " @ " : "",
-					 server_get_network (sess->server, TRUE), sess->channel,
-					 prefs.hex_gui_win_modes && sess->current_modes ? " (" : "",
-					 prefs.hex_gui_win_modes && sess->current_modes ? sess->current_modes : "",
-					 prefs.hex_gui_win_modes && sess->current_modes ? ")" : "",
-					 _(DISPLAY_NAME));
+						 "%s @ %s / %s (%s) - %s",
+						 sess->server->nick, server_get_network (sess->server, TRUE),
+						 sess->channel, sess->current_modes ? sess->current_modes : "",
+						 _(DISPLAY_NAME));
+		}
+		else
+		{
+			g_snprintf (tbuf, sizeof (tbuf),
+						 "%s @ %s / %s - %s",
+						 sess->server->nick, server_get_network (sess->server, TRUE),
+						 sess->channel, _(DISPLAY_NAME));
+		}
 		if (prefs.hex_gui_win_ucount)
 		{
 			g_snprintf (tbuf + strlen (tbuf), 9, " (%d)", sess->total);
@@ -422,9 +419,8 @@ fe_set_title (session *sess)
 		break;
 	case SESS_NOTICES:
 	case SESS_SNOTICES:
-		g_snprintf (tbuf, sizeof (tbuf), "%s%s%s (notices) - %s",
-					 prefs.hex_gui_win_nick ? sess->server->nick : "",
-					 prefs.hex_gui_win_nick ? " @ " : "", server_get_network (sess->server, TRUE),
+		g_snprintf (tbuf, sizeof (tbuf), "%s @ %s (notices) - %s",
+					 sess->server->nick, server_get_network (sess->server, TRUE),
 					 _(DISPLAY_NAME));
 		break;
 	default:
@@ -544,7 +540,7 @@ mg_focus (session *sess)
 	/* when called via mg_changui_new, is_tab might be true, but
 		sess->res->tab is still NULL. */
 	if (sess->res->tab)
-		fe_set_tab_color (sess, FE_COLOR_NONE);
+		fe_set_tab_color (sess, 0);
 }
 
 static int

src/fe-gtk/menu.c

@@ -1362,7 +1362,7 @@ savebuffer_req_done (session *sess, char *file)
 static void
 menu_savebuffer (GtkWidget * wid, gpointer none)
 {
-	gtkutil_file_req (NULL, _("Select an output filename"), savebuffer_req_done,
+	gtkutil_file_req (_("Select an output filename"), savebuffer_req_done,
 							current_sess, NULL, NULL, FRF_WRITE);
 }
 

src/fe-gtk/notifications/notification-freedesktop.c

@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include <string.h>
 #include <gio/gio.h>
 
 static GDBusProxy *fdo_notifications;

src/fe-gtk/plugin-notification.c

@@ -218,7 +218,7 @@ notification_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, cha
 	if (!notification_backend_init (&error))
 	{
 		if (error)
-			g_debug("Failed loading notification plugin: %s\n", error);
+			hexchat_printf(plugin_handle, "Failed loading notification plugin: %s\n", error);
 		return 0;
 	}
 
@@ -246,7 +246,7 @@ notification_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, cha
 
 
 int
-notification_plugin_deinit (void *unused_param)
+notification_plugin_deinit (void)
 {
 	notification_backend_deinit ();
 	return 1;

src/fe-gtk/plugingui.c

@@ -66,6 +66,7 @@ plugingui_treeview_new (GtkWidget *box)
 	                             FILE_COLUMN, _("File"),
 	                             DESC_COLUMN, _("Description"),
 	                             FILEPATH_COLUMN, NULL, -1);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	for (col_id=0; (col = gtk_tree_view_get_column (GTK_TREE_VIEW (view), col_id));
 	     col_id++)
 			gtk_tree_view_column_set_alignment (col, 0.5);
@@ -160,7 +161,7 @@ plugingui_load (void)
 {
 	char *sub_dir = g_build_filename (get_xdir(), "addons", NULL);
 
-	gtkutil_file_req (NULL, _("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
+	gtkutil_file_req (_("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
 							sub_dir, "*."PLUGIN_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);
 
 	g_free (sub_dir);

src/fe-gtk/rawlog.c

@@ -77,7 +77,7 @@ rawlog_clearbutton (GtkWidget * wid, server *serv)
 static int
 rawlog_savebutton (GtkWidget * wid, server *serv)
 {
-	gtkutil_file_req (NULL, _("Save As..."), rawlog_save, serv, NULL, NULL, FRF_WRITE);
+	gtkutil_file_req (_("Save As..."), rawlog_save, serv, NULL, NULL, FRF_WRITE);
 	return FALSE;
 }
 

src/fe-gtk/setup.c

@@ -48,7 +48,6 @@ GtkStyle *create_input_style (GtkStyle *);
 
 #define LABEL_INDENT 12
 
-static GtkWidget *setup_window = NULL;
 static int last_selected_page = 0;
 static int last_selected_row = 0; /* sound row */
 static gboolean color_change;
@@ -176,7 +175,6 @@ static const setting appearance_settings[] =
 	{ST_HEADER,	N_("Title Bar"),0,0,0},
 	{ST_TOGGLE, N_("Show channel modes"), P_OFFINTNL(hex_gui_win_modes),0,0,0},
 	{ST_TOGGLR, N_("Show number of users"), P_OFFINTNL(hex_gui_win_ucount),0,0,0},
-	{ST_TOGGLE, N_("Show nickname"), P_OFFINTNL(hex_gui_win_nick),0,0,0},
 
 	{ST_END, 0, 0, 0, 0, 0}
 };
@@ -909,7 +907,7 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)
 
 #ifndef WIN32 /* Windows always supports this */
 	/* Only used for transparency currently */
-	if (!gdk_screen_is_composited (gdk_window_get_screen (GDK_WINDOW (current_sess->gui->window))))
+	if (!gtk_widget_is_composited (current_sess->gui->window))
 		gtk_widget_set_sensitive (wid, FALSE);
 #endif
 }
@@ -1107,8 +1105,8 @@ setup_browsefile_cb (GtkWidget *button, GtkWidget *entry)
 	filter = "image/*";
 	filter_type = FRF_MIMETYPES;
 #endif
-	gtkutil_file_req (GTK_WINDOW (setup_window), _("Select an Image File"), setup_filereq_cb,
-					entry, NULL, filter, filter_type|FRF_RECENTLYUSED|FRF_MODAL);
+	gtkutil_file_req (_("Select an Image File"), setup_filereq_cb,
+					entry, NULL, filter, filter_type|FRF_RECENTLYUSED);
 }
 
 static void
@@ -1143,7 +1141,7 @@ setup_fontsel_cancel (GtkWidget *button, GtkFontSelectionDialog *dialog)
 static void
 setup_browsefolder_cb (GtkWidget *button, GtkEntry *entry)
 {
-	gtkutil_file_req (GTK_WINDOW (setup_window), _("Select Download Folder"), setup_filereq_cb, entry, (char*)gtk_entry_get_text (entry), NULL, FRF_CHOOSEFOLDER|FRF_MODAL);
+	gtkutil_file_req (_("Select Download Folder"), setup_filereq_cb, entry, (char*)gtk_entry_get_text (entry), NULL, FRF_CHOOSEFOLDER);
 }
 
 static void
@@ -1156,9 +1154,6 @@ setup_browsefont_cb (GtkWidget *button, GtkWidget *entry)
 	dialog = (GtkFontSelectionDialog *) gtk_font_selection_dialog_new (_("Select font"));
 	font_dialog = (GtkWidget *)dialog;	/* global var */
 
-	gtk_window_set_transient_for (GTK_WINDOW (font_dialog), GTK_WINDOW (setup_window));
-	gtk_window_set_modal (GTK_WINDOW (font_dialog), TRUE);
-
 	sel = (GtkFontSelection *) gtk_font_selection_dialog_get_font_selection (dialog);
 
 	if (gtk_entry_get_text (GTK_ENTRY (entry))[0])
@@ -1462,8 +1457,6 @@ setup_color_cb (GtkWidget *button, gpointer userdata)
 	g_object_set_data (G_OBJECT (ok_button), "b", button);
 	gtk_widget_set_sensitive (help_button, FALSE);
 	gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (cdialog)), color);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (setup_window));
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 	gtk_widget_show (dialog);
 
 	g_object_unref (cancel_button);
@@ -1718,8 +1711,8 @@ setup_snd_browse_cb (GtkWidget *button, GtkEntry *entry)
 	filter_type = FRF_MIMETYPES;
 #endif
 
-	gtkutil_file_req (GTK_WINDOW (setup_window), _("Select a sound file"), setup_snd_filereq_cb, entry,
-						sounds_dir, filter, FRF_MODAL|FRF_FILTERISINITIAL|filter_type);
+	gtkutil_file_req (_("Select a sound file"), setup_snd_filereq_cb, entry,
+						sounds_dir, filter, FRF_FILTERISINITIAL|filter_type);
 	g_free (sounds_dir);
 }
 
@@ -1794,6 +1787,7 @@ setup_create_sound_page (void)
 							G_CALLBACK (setup_snd_row_cb), NULL);
 	gtk_widget_show (sound_tree);
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), sound_tree);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (sound_tree), TRUE);
 
 	table1 = gtk_table_new (2, 3, FALSE);
 	gtk_widget_show (table1);
@@ -2342,6 +2336,8 @@ setup_close_cb (GtkWidget *win, GtkWidget **swin)
 void
 setup_open (void)
 {
+	static GtkWidget *setup_window = NULL;
+
 	if (setup_window)
 	{
 		gtk_window_present (GTK_WINDOW (setup_window));

src/fe-gtk/sexy-spell-entry.c

@@ -1255,7 +1255,7 @@ void
 sexy_spell_entry_activate_default_languages(SexySpellEntry *entry)
 {
 	GSList *enchant_langs;
-	char *lang, **i, **langs;
+	char *lang, *langs;
 
 	if (!have_enchant)
 		return;
@@ -1265,21 +1265,21 @@ sexy_spell_entry_activate_default_languages(SexySpellEntry *entry)
 
 	enchant_langs = sexy_spell_entry_get_languages(entry);
 
-	langs = g_strsplit_set (prefs.hex_text_spell_langs, ", \t", 0);
+	langs = g_strdup (prefs.hex_text_spell_langs);
 
-	for (i = langs; *i; i++)
+	lang = strtok (langs, ",");
+	while (lang != NULL)
 	{
-		lang = *i;
-
 		if (enchant_has_lang (lang, enchant_langs))
 		{
 			sexy_spell_entry_activate_language_internal (entry, lang, NULL);
 		}
+		lang = strtok (NULL, ",");
 	}
 
 	g_slist_foreach(enchant_langs, (GFunc) g_free, NULL);
 	g_slist_free(enchant_langs);
-	g_strfreev (langs);
+	g_free (langs);
 
 	/* If we don't have any languages activated, use "en" */
 	if (entry->priv->dict_list == NULL)

src/fe-gtk/textgui.c

@@ -131,7 +131,7 @@ PrintTextRaw (void *xtbuf, unsigned char *text, int indent, time_t stamp)
 			{
 				beep_done = TRUE;
 				if (!prefs.hex_input_filter_beep)
-					gdk_display_beep (gdk_display_get_default ());
+					gdk_beep ();
 			}
 		default:
 			text++;
@@ -282,7 +282,7 @@ pevent_save_cb (GtkWidget * wid, void *data)
 {
 	if (data)
 	{
-		gtkutil_file_req (NULL, _("Print Texts File"), pevent_save_req_cb, NULL,
+		gtkutil_file_req (_("Print Texts File"), pevent_save_req_cb, NULL,
 								NULL, NULL, FRF_WRITE);
 		return;
 	}
@@ -304,7 +304,7 @@ pevent_load_req_cb (void *arg1, char *file)
 static void
 pevent_load_cb (GtkWidget * wid, void *data)
 {
-	gtkutil_file_req (NULL, _("Print Texts File"), pevent_load_req_cb, NULL, NULL, NULL, 0);
+	gtkutil_file_req (_("Print Texts File"), pevent_load_req_cb, NULL, NULL, NULL, 0);
 }
 
 static void
@@ -356,6 +356,7 @@ pevent_treeview_new (GtkWidget *box)
 	view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
 	gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (view), TRUE);
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW (view), TRUE);
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	g_signal_connect (G_OBJECT (sel), "changed",

src/fe-gtk/urlgrab.c

@@ -145,7 +145,7 @@ url_save_callback (void *arg1, char *file)
 static void
 url_button_save (void)
 {
-	gtkutil_file_req (NULL, _("Select an output filename"),
+	gtkutil_file_req (_("Select an output filename"),
 							url_save_callback, NULL, NULL, NULL, FRF_WRITE);
 }
 

src/fe-gtk/xtext.c

@@ -947,7 +947,7 @@ gtk_xtext_find_char (GtkXText * xtext, int x, int y, int *off, int *out_of_bound
 	textentry *ent;
 	int line;
 	int subline;
-	int outofbounds = FALSE;
+	int outofbounds;
 
 	/* Adjust y value for negative rounding, double to int */
 	if (y < 0)
@@ -3811,8 +3811,7 @@ gtk_xtext_render_page (GtkXText * xtext)
 	if (xtext->buffer->indent < MARGIN)
 		xtext->buffer->indent = MARGIN;	  /* 2 pixels is our left margin */
 
-	width = gdk_window_get_width (GTK_WIDGET (xtext)->window);
-	height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
+	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &width, &height);
 
 	if (width < 34 || height < xtext->fontsize || width < xtext->buffer->indent + 32)
 		return;

src/fe-text/fe-text.c

@@ -623,7 +623,7 @@ fe_cleanup (void)
 {
 }
 void
-fe_set_tab_color (struct session *sess, tabcolor col)
+fe_set_tab_color (struct session *sess, int col)
 {
 }
 void

win32/AppxManifest.xml.in

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap uap3 uap10 rescap">
+  <Identity Name="39215TingPing.HexChat" Publisher="CN=0330FC06-4EE0-4AAB-8FB9-F9B6C1FA037F" Version="<#= [string]::Join('.', $versionParts) #>.0" ProcessorArchitecture="x86" />
+  <Properties>
+    <DisplayName>HexChat</DisplayName>
+    <PublisherDisplayName>TingPing</PublisherDisplayName>
+    <Description>Chat Client</Description>
+    <Logo>Assets\StoreLogo.png</Logo>
+    <uap10:PackageIntegrity>
+      <uap10:Content Enforcement="on" />
+    </uap10:PackageIntegrity>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource uap:Scale="100" />
+    <Resource uap:Scale="125" />
+    <Resource uap:Scale="150" />
+    <Resource uap:Scale="200" />
+    <Resource uap:Scale="400" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.1" />
+    <PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.24217.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="HexChat" Executable="hexchat.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements DisplayName="HexChat" Description="HexChat" BackgroundColor="transparent" Square150x150Logo="Assets\AppMedTile.png" Square44x44Logo="Assets\AppList.png">
+      </uap:VisualElements>
+      <Extensions>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol Name="irc" Parameters="--url=&quot;%1&quot;">
+            <uap:DisplayName>IRC</uap:DisplayName>
+            <uap:Logo>Assets\irc.png</uap:Logo>
+          </uap3:Protocol>
+        </uap3:Extension>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol Name="ircs" Parameters="--url=&quot;%1&quot;">
+            <uap:DisplayName>IRCS</uap:DisplayName>
+            <uap:Logo>Assets\irc.png</uap:Logo>
+          </uap3:Protocol>
+        </uap3:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>