Add manual SASL password prompt

Use owned channel tree font for palette behavior

.github/workflows/appimage-build.yml

@@ -37,7 +37,6 @@ jobs:
             liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
             perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
             fonts-noto-color-emoji breeze-gtk-theme \
-            python3-venv \
             patchelf file curl
 
       - name: Configure
@@ -207,10 +206,6 @@ jobs:
             export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/zoitechat/plugins"
           fi
 
-          if [ -f "$APPDIR/usr/share/doc/zoitechat/html/index.html" ]; then
-            export ZOITECHAT_DOCDIR="$APPDIR/usr/share/doc/zoitechat/html"
-          fi
-
           if [ -d "$APPDIR/usr/share/glib-2.0/schemas" ]; then
             export GSETTINGS_SCHEMA_DIR="$APPDIR/usr/share/glib-2.0/schemas${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
           fi

.github/workflows/manjaro-package-build.yml

@@ -1,79 +0,0 @@
-name: Manjaro Package Build
-
-on:
-  push:
-    branches: [master, main]
-  pull_request:
-    branches: [master, main]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  manjaro-package:
-    runs-on: ubuntu-latest
-    container:
-      image: manjarolinux/base:latest
-
-    steps:
-      - name: Install packaging toolchain
-        run: |
-          set -euxo pipefail
-          pacman -Syu --noconfirm
-          pacman -S --noconfirm --needed \
-            base-devel \
-            git \
-            namcap \
-            meson \
-            ninja \
-            pkgconf \
-            glib2 \
-            glib2-devel \
-            gtk3 \
-            openssl \
-            libcanberra \
-            libayatana-appindicator \
-            iso-codes \
-            lua \
-            perl \
-            python \
-            python-cffi \
-            pciutils
-
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
-          submodules: true
-
-      - name: Build package and generate .SRCINFO (non-root)
-        run: |
-          set -euxo pipefail
-          id -u builder >/dev/null 2>&1 || useradd -m builder
-          chown -R builder:builder "$GITHUB_WORKSPACE"
-          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --noconfirm --syncdeps --cleanbuild"
-          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --printsrcinfo > .SRCINFO"
-
-      - name: Lint PKGBUILD and package with namcap
-        run: |
-          set -euxo pipefail
-          cd "$GITHUB_WORKSPACE/packaging/manjaro"
-          namcap PKGBUILD
-          pkg_file="$(find . -maxdepth 1 -type f -name '*.pkg.tar.*' | head -n1)"
-          namcap "$pkg_file"
-
-      - name: Collect artifacts
-        run: |
-          set -euxo pipefail
-          mkdir -p artifacts
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/*.pkg.tar.* artifacts/
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/PKGBUILD artifacts/
-          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/.SRCINFO artifacts/
-
-      - name: Upload package artifacts
-        uses: actions/upload-artifact@v6
-        with:
-          name: zoitechat-manjaro-package
-          path: artifacts/*
-          if-no-files-found: error

.github/workflows/windows-build.yml

@@ -113,13 +113,6 @@ jobs:
             New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
           }
 
-      # Runs while Python 3.14 is still the active interpreter; the installer
-      # packages rel\offline-docs as the "Offline Documentation" component and
-      # skips it if this step could not build the docs.
-      - name: Build offline documentation
-        run: |
-          python data\misc\build_offline_docs.py --output ..\zoitechat-build\${{ matrix.platform }}\rel\offline-docs
-
       - uses: actions/setup-python@v6
         with:
           python-version: '3.8.10'

data/meson.build

@@ -6,29 +6,4 @@ if get_option('gtk-frontend')
   subdir('icons')
   subdir('misc')
   subdir('man')
-
-  # Fetch and build the offline manual so Help->Contents works without
-  # connectivity. 'auto' skips with a warning when the docs cannot be
-  # fetched (e.g. network-less distro builds, which ship docs themselves);
-  # 'enabled' makes that a hard error.
-  offline_docs_opt = get_option('offline-docs')
-  if not offline_docs_opt.disabled()
-    offline_docs_args = [
-      '--repo', get_option('offline-docs-repo'),
-      '--output', join_paths(meson.current_build_dir(), 'offline-docs'),
-      '--stamp', '@OUTPUT@',
-    ]
-    if offline_docs_opt.enabled()
-      offline_docs_args += ['--strict']
-    endif
-    custom_target('offline-docs',
-      output: 'offline-docs.stamp',
-      command: [find_program('python3'), files('misc/build_offline_docs.py')] + offline_docs_args,
-      build_by_default: true,
-    )
-    meson.add_install_script(files('misc/install_offline_docs.py'),
-      join_paths(meson.current_build_dir(), 'offline-docs'),
-      offline_docs_dir,
-    )
-  endif
 endif

data/misc/build_offline_docs.py

@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-"""Build ZoiteChat's offline HTML documentation for bundling with releases.
-
-Clones the ZoiteChat/documentation repository, preferring a tag that
-matches this source tree's version so the bundled manual matches the
-application, and builds it with Sphinx into --output. Used by the
-meson build (offline-docs option) and by the Windows CI workflow.
-
-Sphinx is installed into a throwaway virtualenv so the invoking Python
-(which the Windows build also bundles pieces of) is left untouched.
-
-Unless --strict is given, any failure prints a warning (GitHub Actions
-annotation syntax) and exits 0: builds then simply fall back to opening
-the online manual instead of failing outright.
-"""
-
-import argparse
-import pathlib
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-DEFAULT_REPO = "https://github.com/ZoiteChat/documentation.git"
-
-
-def project_version() -> str:
-    meson_build = pathlib.Path(__file__).resolve().parents[2] / "meson.build"
-    match = re.search(r"version\s*:\s*'([^']+)'", meson_build.read_text(encoding="utf-8"))
-    if not match:
-        raise RuntimeError(f"could not parse project version from {meson_build}")
-    return match.group(1)
-
-
-def run(argv, **kwargs) -> None:
-    print("+", " ".join(str(arg) for arg in argv), flush=True)
-    subprocess.run(argv, check=True, **kwargs)
-
-
-def clone_docs(repo: str, version: str, target: pathlib.Path) -> str:
-    # A missing tag falls through to the default branch so the docs may be
-    # newer than the app, which beats shipping none at all.
-    for ref in (f"v{version}", version, None):
-        cmd = ["git", "clone", "--depth", "1"]
-        if ref:
-            cmd += ["--branch", ref]
-        cmd += [repo, str(target)]
-        try:
-            run(cmd)
-            return ref or "default branch"
-        except subprocess.CalledProcessError:
-            shutil.rmtree(target, ignore_errors=True)
-    raise RuntimeError(f"could not clone {repo}")
-
-
-def find_source_dir(checkout: pathlib.Path) -> pathlib.Path:
-    for candidate in (checkout, checkout / "docs", checkout / "doc"):
-        if (candidate / "conf.py").is_file():
-            return candidate
-    raise RuntimeError(f"no Sphinx conf.py found in {checkout}")
-
-
-def venv_python(venv_dir: pathlib.Path) -> pathlib.Path:
-    if sys.platform == "win32":
-        return venv_dir / "Scripts" / "python.exe"
-    return venv_dir / "bin" / "python"
-
-
-def build(output: pathlib.Path, repo: str, version: str) -> None:
-    with tempfile.TemporaryDirectory(prefix="zoitechat-docs-") as tmp:
-        tmp_dir = pathlib.Path(tmp)
-        checkout = tmp_dir / "documentation"
-        html_dir = tmp_dir / "html"
-        venv_dir = tmp_dir / "venv"
-
-        ref = clone_docs(repo, version, checkout)
-        print(f"building documentation from {ref}", flush=True)
-        source_dir = find_source_dir(checkout)
-
-        run([sys.executable, "-m", "venv", str(venv_dir)])
-        python = venv_python(venv_dir)
-        requirements = source_dir / "requirements.txt"
-        if not requirements.is_file():
-            requirements = checkout / "requirements.txt"
-        if requirements.is_file():
-            run([python, "-m", "pip", "install", "--quiet", "-r", str(requirements)])
-            run([python, "-m", "pip", "install", "--quiet", "sphinx"])
-        else:
-            run([python, "-m", "pip", "install", "--quiet", "sphinx", "sphinx_rtd_theme"])
-
-        run([python, "-m", "sphinx", "-b", "html", str(source_dir), str(html_dir)])
-        if not (html_dir / "index.html").is_file():
-            raise RuntimeError("Sphinx build produced no index.html")
-
-        if output.exists():
-            shutil.rmtree(output)
-        shutil.copytree(html_dir, output,
-                        ignore=shutil.ignore_patterns(".doctrees", ".buildinfo"))
-
-    file_count = sum(1 for path in output.rglob("*") if path.is_file())
-    print(f"offline documentation staged at {output} ({file_count} files)", flush=True)
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--output", required=True, type=pathlib.Path,
-                        help="directory to stage the built HTML tree into")
-    parser.add_argument("--repo", default=DEFAULT_REPO,
-                        help="documentation git repository to build from")
-    parser.add_argument("--version", default=None,
-                        help="app version used to pick a matching docs tag "
-                             "(default: parsed from meson.build)")
-    parser.add_argument("--strict", action="store_true",
-                        help="fail on error instead of emitting a warning")
-    parser.add_argument("--stamp", type=pathlib.Path, default=None,
-                        help="file to touch on completion (meson target output)")
-    args = parser.parse_args()
-
-    try:
-        build(args.output, args.repo, args.version or project_version())
-    except Exception as error:  # noqa: BLE001 - degrade to website-only help
-        if args.strict:
-            raise
-        print(f"::warning::offline documentation not bundled: {error}", flush=True)
-
-    if args.stamp:
-        args.stamp.write_text("ok\n", encoding="utf-8")
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

data/misc/install_offline_docs.py

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-"""Meson install helper: copy the built offline docs into the install tree.
-
-Silently skips when the docs were not built (offline-docs=auto without
-network); Help->Contents then falls back to the online manual.
-"""
-
-import os
-import pathlib
-import shutil
-import sys
-
-src = pathlib.Path(sys.argv[1])
-dest_arg = pathlib.PurePath(sys.argv[2])
-
-if not (src / "index.html").is_file():
-    print("offline documentation was not built; skipping install")
-    sys.exit(0)
-
-if dest_arg.is_absolute():
-    # An absolute offline-docs-dir lands outside the prefix; honour DESTDIR
-    destdir = os.environ.get("DESTDIR", "")
-    dest = pathlib.Path(destdir + str(dest_arg)) if destdir else pathlib.Path(dest_arg)
-else:
-    dest = pathlib.Path(os.environ["MESON_INSTALL_DESTDIR_PREFIX"]) / dest_arg
-
-if dest.exists():
-    shutil.rmtree(dest)
-dest.parent.mkdir(parents=True, exist_ok=True)
-shutil.copytree(src, dest)
-print(f"Installed offline documentation to {dest}")

meson.build

@@ -35,16 +35,6 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'zoitechat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
-
-# Where Help->Contents looks for locally installed documentation before
-# falling back to the online manual. Packagers that ship the HTML docs
-# elsewhere can point this at their doc directory.
-offline_docs_dir = get_option('offline-docs-dir')
-if offline_docs_dir == ''
-  offline_docs_dir = join_paths(get_option('datadir'), 'doc', 'zoitechat', 'html')
-endif
-config_h.set_quoted('ZOITECHATDOCDIR', join_paths(get_option('prefix'), offline_docs_dir))
-
 config_h.set10('ENABLE_NLS', true)
 
 # Optional features

meson_options.txt

@@ -33,15 +33,6 @@ option('install-appdata', type: 'boolean',
 option('install-plugin-metainfo', type: 'boolean', value: false,
   description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
 )
-option('offline-docs', type: 'feature', value: 'auto',
-  description: 'Fetch, build and install the offline HTML documentation (needs network at build time); auto skips with a warning when unavailable'
-)
-option('offline-docs-dir', type: 'string', value: '',
-  description: 'Directory searched for offline HTML documentation (index.html), absolute or relative to prefix. Defaults to $datadir/doc/zoitechat/html'
-)
-option('offline-docs-repo', type: 'string', value: 'https://github.com/ZoiteChat/documentation.git',
-  description: 'Git repository the offline documentation is built from'
-)
 
 # Plugins
 option('with-checksum', type: 'boolean',

packaging/manjaro/PKGBUILD

@@ -1,69 +0,0 @@
-# Maintainer: ZoiteChat Maintainers <zoitechat@users.noreply.github.com>
-
-pkgname=zoitechat-git
-pkgver=0
-pkgrel=1
-pkgdesc='IRC client for GNOME (ZoiteChat development snapshot)'
-arch=('x86_64')
-url='https://github.com/zoitechat/zoitechat'
-license=('GPL-2.0-or-later')
-depends=(
-  'glib2'
-  'gtk3'
-  'iso-codes'
-  'libayatana-appindicator'
-  'libcanberra'
-  'lua'
-  'openssl'
-  'perl'
-  'python-cffi'
-)
-makedepends=(
-  'git'
-  'meson'
-  'ninja'
-  'pkgconf'
-  'python'
-)
-optdepends=(
-  'pciutils: sysinfo plugin hardware detection details'
-)
-provides=('zoitechat')
-conflicts=('zoitechat')
-
-_repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
-source=("zoitechat::git+file://${_repo_root}")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$srcdir/zoitechat"
-
-  if git describe --long --tags --abbrev=7 >/dev/null 2>&1; then
-    git describe --long --tags --abbrev=7 \
-      | sed 's/^v//' \
-      | sed -E 's/([^-]+)-([0-9]+)-g/\1.r\2.g/' \
-      | sed 's/-/./g'
-  else
-    printf '0.r%s.%s\n' \
-      "$(git rev-list --count HEAD)" \
-      "$(git rev-parse --short=7 HEAD)"
-  fi
-}
-
-build() {
-  arch-meson zoitechat build \
-    -Dtext-frontend=false \
-    -Dwith-checksum=true \
-    -Dwith-fishlim=true \
-    -Dwith-lua=lua \
-    -Dwith-perl=perl \
-    -Dwith-python=python3 \
-    -Dwith-sysinfo=true \
-    -Dinstall-plugin-metainfo=true
-
-  meson compile -C build
-}
-
-package() {
-  meson install -C build --destdir "$pkgdir"
-}

src/common/fe.h

@@ -142,6 +142,7 @@ void fe_set_away (server *serv);
 void fe_serverlist_open (session *sess);
 void fe_get_bool (char *title, char *prompt, void *callback, void *userdata);
 void fe_get_str (char *prompt, char *def, void *callback, void *ud);
+void fe_get_password (char *prompt, void *callback, void *ud);
 void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_WRITE 1				/* save file */
 #define FRF_MULTIPLE 2			/* multi-select */

src/common/servlist.c

@@ -439,8 +439,99 @@ servlist_favchan_copy (favchannel *fav)
 	return newfav;
 }
 
+static void servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password);
+
+typedef struct
+{
+	session *sess;
+	ircnet *net;
+	gboolean join;
+} servlist_password_prompt;
+
+static gboolean
+servlist_login_uses_password_sasl (int logintype)
+{
+	return logintype == LOGIN_SASL ||
+		logintype == LOGIN_SASL_SCRAM_SHA_1 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_256 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_512;
+}
+
+static void servlist_prompt_sasl_password (servlist_password_prompt *prompt);
+
+static void
+servlist_connect_without_password_cb (int value, void *userdata)
+{
+	servlist_password_prompt *prompt = userdata;
+
+	if (value)
+	{
+		servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, NULL);
+		g_free (prompt);
+	}
+	else
+	{
+		servlist_prompt_sasl_password (prompt);
+	}
+}
+
+static void
+servlist_connect_password_cb (int cancel, char *text, void *userdata)
+{
+	servlist_password_prompt *prompt = userdata;
+	char *msg;
+
+	if (cancel)
+	{
+		fe_serverlist_open (prompt->sess);
+		g_free (prompt);
+		return;
+	}
+
+	if (text && *text)
+	{
+		servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, text);
+		g_free (prompt);
+		return;
+	}
+
+	msg = g_strdup_printf (_("Continue connecting to %s without a SASL password?"), prompt->net->name ? prompt->net->name : _("this network"));
+	fe_get_bool (_("No SASL password"), msg, servlist_connect_without_password_cb, prompt);
+	g_free (msg);
+}
+
+static void
+servlist_prompt_sasl_password (servlist_password_prompt *prompt)
+{
+	char *msg;
+
+	msg = g_strdup_printf (_("Enter SASL password for %s:"), prompt->net->name ? prompt->net->name : _("this network"));
+	fe_get_password (msg, servlist_connect_password_cb, prompt);
+	g_free (msg);
+}
+
 void
 servlist_connect (session *sess, ircnet *net, gboolean join)
+{
+	int logintype;
+	servlist_password_prompt *prompt;
+
+	logintype = net && net->logintype ? net->logintype : LOGIN_DEFAULT_REAL;
+	if (net && (net->flags & FLAG_PROMPT_PASSWORD) && servlist_login_uses_password_sasl (logintype))
+	{
+		prompt = g_new0 (servlist_password_prompt, 1);
+		prompt->sess = sess;
+		prompt->net = net;
+		prompt->join = join;
+		servlist_prompt_sasl_password (prompt);
+		return;
+	}
+
+	servlist_connect_with_password (sess, net, join, NULL);
+}
+
+static void
+servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password)
 {
 	ircserver *ircserv;
 	GSList *list;
@@ -487,7 +578,11 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
 	}
 
 	serv->password[0] = 0;
-	if ((net->flags & FLAG_USE_KEYRING) && net->name)
+	if (password && *password)
+	{
+		safe_strcpy (serv->password, password, sizeof (serv->password));
+	}
+	else if ((net->flags & FLAG_USE_KEYRING) && net->name)
 	{
 		char *stored_pass = secretstore_get_network_password (net->name);
 		if (stored_pass && *stored_pass)

src/common/servlist.h

@@ -63,7 +63,8 @@ extern GSList *network_list;
 #define FLAG_ALLOW_INVALID		32
 #define FLAG_FAVORITE			64
 #define FLAG_USE_KEYRING		128
-#define FLAG_COUNT				8
+#define FLAG_PROMPT_PASSWORD	256
+#define FLAG_COUNT				9
 
 /* Login methods. Use server password by default - if we had a NickServ password, it'd be set to 2 already by servlist_load() */
 #define LOGIN_DEFAULT_REAL		LOGIN_PASS		/* this is to set the default login method for unknown servers */

src/fe-gtk/chanview.c

@@ -174,7 +174,7 @@ chanview_apply_theme (chanview *cv)
 	chanview_set_font_desc (cv, font);
 
 	theme_manager_apply_channel_tree_style (w,
-			theme_manager_get_channel_tree_palette_behavior (font));
+			theme_manager_get_channel_tree_palette_behavior (cv->font_desc));
 }
 
 static void

src/fe-gtk/gtkutil.c

@@ -527,6 +527,43 @@ gtkutil_destroy (GtkWidget * igad, GtkWidget * dgad)
 	gtk_widget_destroy (dgad);
 }
 
+static void
+gtkutil_place_dialog (GtkWidget *dialog)
+{
+	GList *list;
+	GList *item;
+	GtkWindow *anchor = NULL;
+	gint x;
+	gint y;
+	extern GtkWidget *parent_window;
+
+	list = gtk_window_list_toplevels ();
+	for (item = list; item; item = item->next)
+	{
+		if (item->data != dialog && GTK_IS_WINDOW (item->data) &&
+			gtk_widget_get_visible (GTK_WIDGET (item->data)) &&
+			gtk_window_is_active (GTK_WINDOW (item->data)))
+		{
+			anchor = GTK_WINDOW (item->data);
+			break;
+		}
+	}
+	g_list_free (list);
+
+	if (!anchor && parent_window && parent_window != dialog && GTK_IS_WINDOW (parent_window))
+		anchor = GTK_WINDOW (parent_window);
+
+	if (anchor)
+	{
+		gtk_window_get_position (anchor, &x, &y);
+		gtk_window_move (GTK_WINDOW (dialog), x, y);
+	}
+	else
+	{
+		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+	}
+}
+
 static void
 gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
 {
@@ -540,15 +577,15 @@ gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
 
 	switch (arg1)
 	{
-	case GTK_RESPONSE_REJECT:
-		callback (TRUE, text, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
 	case GTK_RESPONSE_ACCEPT:
 		callback (FALSE, text, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
+		break;
+	default:
+		callback (TRUE, text, user_data);
 		break;
 	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
@@ -557,8 +594,8 @@ gtkutil_str_enter (GtkWidget *entry, GtkWidget *dialog)
 	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 }
 
-void
-fe_get_str (char *msg, char *def, void *callback, void *userdata)
+static void
+gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean visible)
 {
 	GtkWidget *dialog;
 	GtkWidget *entry;
@@ -572,18 +609,11 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 										NULL);
 	theme_manager_attach_window (dialog);
 
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
 
-	if (userdata == (void *)1)	/* nick box is usually on the very bottom, make it centered */
-	{
-		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-	}
-	else
-	{
-		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	}
-
 	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
@@ -592,7 +622,8 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 	entry = gtk_entry_new ();
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (gtkutil_str_enter), dialog);
-	gtk_entry_set_text (GTK_ENTRY (entry), def);
+	gtk_entry_set_text (GTK_ENTRY (entry), def ? def : "");
+	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
 	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);
 
 	label = gtk_label_new (msg);
@@ -606,6 +637,18 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 	gtk_widget_show_all (dialog);
 }
 
+void
+fe_get_str (char *msg, char *def, void *callback, void *userdata)
+{
+	gtkutil_get_str (msg, def, callback, userdata, TRUE);
+}
+
+void
+fe_get_password (char *msg, void *callback, void *userdata)
+{
+	gtkutil_get_str (msg, "", callback, userdata, FALSE);
+}
+
 static void
 gtkutil_get_number_response (GtkDialog *dialog, gint arg1, gpointer spin)
 {
@@ -641,15 +684,15 @@ gtkutil_get_bool_response (GtkDialog *dialog, gint arg1, gpointer spin)
 
 	switch (arg1)
 	{
-	case GTK_RESPONSE_REJECT:
-		callback (0, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
 	case GTK_RESPONSE_ACCEPT:
 		callback (1, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
+		break;
+	default:
+		callback (0, user_data);
 		break;
 	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 void
@@ -667,9 +710,10 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 										_("_OK"), GTK_RESPONSE_ACCEPT,
 										NULL);
 	theme_manager_attach_window (dialog);
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 
 	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
 
@@ -707,10 +751,10 @@ fe_get_bool (char *title, char *prompt, void *callback, void *userdata)
 		_("_Yes"), GTK_RESPONSE_ACCEPT,
 		NULL);
 	theme_manager_attach_window (dialog);
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
-
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);

src/fe-gtk/menu.c

@@ -138,6 +138,7 @@ struct mymenu
 #define XCMENU_MARKUP 2
 #define XCMENU_MNEMONIC 4
 
+/* execute a userlistbutton/popupmenu command */
 
 static void
 nick_command (session * sess, char *cmd)
@@ -148,6 +149,7 @@ nick_command (session * sess, char *cmd)
 		handle_command (sess, cmd, TRUE);
 }
 
+/* fill in the %a %s %n etc and execute the command */
 
 void
 nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
@@ -176,6 +178,7 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
 		}
 	}
 
+	/* this can't overflow, since popup->cmd is only 256 */
 	len = strlen (cmd) + strlen (nick) + strlen (allnick) + 512;
 	buf = g_malloc (len);
 
@@ -188,6 +191,7 @@ nick_command_parse (session *sess, char *cmd, char *nick, char *allnick)
 	g_free (buf);
 }
 
+/* userlist button has been clicked */
 
 void
 userlist_button_cb (GtkWidget * button, char *cmd)
@@ -204,6 +208,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 
 	if (sess->type == SESS_DIALOG)
 	{
+		/* fake a selection */
 		nicks = g_new (char *, 2);
 		nicks[0] = g_strdup (sess->channel);
 		nicks[1] = NULL;
@@ -211,6 +216,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 	}
 	else
 	{
+		/* find number of selected rows */
 		nicks = userlist_selection_list (sess->gui->user_tree, &num_sel);
 		if (num_sel < 1)
 		{
@@ -221,6 +227,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 		}
 	}
 
+	/* create "allnicks" string */
 	allnicks = g_malloc (((NICKLEN + 1) * num_sel) + 1);
 	*allnicks = 0;
 
@@ -234,6 +241,7 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 		if (!nick)
 			nick = nicks[0];
 
+		/* if not using "%a", execute the command once for each nickname */
 		if (!using_allnicks)
 			nick_command_parse (sess, cmd, nicks[i], "");
 
@@ -257,16 +265,19 @@ userlist_button_cb (GtkWidget * button, char *cmd)
 	g_free (allnicks);
 }
 
+/* a popup-menu-item has been selected */
 
 static void
 popup_menu_cb (GtkWidget * item, char *cmd)
 {
 	char *nick;
 
+	/* the userdata is set in menu_quick_item() */
 	nick = g_object_get_data (G_OBJECT (item), "u");
 
 	if (!nick)	/* userlist popup menu */
 	{
+		/* treat it just like a userlist button */
 		userlist_button_cb (NULL, cmd);
 		return;
 	}
@@ -378,6 +389,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 	if (!name)
 		return menu;
 
+	/* Code to add a submenu */
 	sub_menu = menu_new ();
 	if (flags & XCMENU_MARKUP)
 	{
@@ -399,6 +411,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 		*sub_item_ret = sub_item;
 
 	if (flags & XCMENU_DOLIST)
+		/* We create a new element in the list */
 		submenu_list = g_slist_prepend (submenu_list, sub_menu);
 	return sub_menu;
 }
@@ -406,6 +419,7 @@ menu_quick_sub (char *name, GtkWidget *menu, GtkWidget **sub_item_ret, int flags
 static GtkWidget *
 menu_quick_endsub (void)
 {
+	/* Just delete the first element in the linked list pointed to by first */
 	if (submenu_list)
 		submenu_list = g_slist_remove (submenu_list, submenu_list->data);
 
@@ -436,7 +450,10 @@ is_in_path (char *cmd)
 	char **argv;
 	int argc;
 
+	/* special-case these default entries. */
+	/*                  123456789012345678 */
 	if (strncmp (prog, "gnome-terminal -x ", 18) == 0)
+	/* don't check for gnome-terminal, but the thing it's executing! */
 		prog += 18;
 
 	if (g_shell_parse_argv (prog, &argc, &argv, NULL))
@@ -455,6 +472,7 @@ is_in_path (char *cmd)
 	return 0;
 }
 
+/* syntax: "LABEL~ICON~STUFF~ADDED~LATER~" */
 
 static void
 menu_extract_icon (char *name, char **label, char **icon)
@@ -467,6 +485,7 @@ menu_extract_icon (char *name, char **label, char **icon)
 	{
 		if (*p == '~')
 		{
+			/* escape \~ */
 			if (p == name || p[-1] != '\\')
 			{
 				if (!start)
@@ -493,6 +512,7 @@ menu_extract_icon (char *name, char **label, char **icon)
 	}
 }
 
+/* append items to "menu" using the (struct popup*) list provided */
 
 void
 menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
@@ -519,12 +539,14 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 
 		} else if (!g_ascii_strncasecmp (pop->name, "ENDSUB", 6))
 		{
+			/* empty sub menu due to no programs in PATH? */
 			if (check_path && childcount < 1)
 				gtk_widget_destroy (subitem);
 			subitem = NULL;
 
 			if (tempmenu != menu)
 				tempmenu = menu_quick_endsub ();
+			/* If we get here and tempmenu equals menu that means we havent got any submenus to exit from */
 
 		} else if (!g_ascii_strncasecmp (pop->name, "SEP", 3))
 		{
@@ -534,8 +556,10 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 		{
 			char *icon, *label;
 
+			/* default command in zoitechat.c */
 			if (pop->cmd[0] == 'n' && !strcmp (pop->cmd, "notify -n ASK %s"))
 			{
+				/* don't create this item if already in notify list */
 				if (!target || notify_is_in_list (current_sess->server, target))
 				{
 					list = list->next;
@@ -548,6 +572,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 			if (!check_path || pop->cmd[0] != '!')
 			{
 				menu_quick_item (pop->cmd, label, tempmenu, 0, target, icon);
+			/* check if the program is in path, if not, leave it out! */
 			} else if (is_in_path (pop->cmd))
 			{
 				childcount++;
@@ -561,6 +586,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path)
 		list = list->next;
 	}
 
+	/* Let's clean up the linked list from mem */
 	while (submenu_list)
 		submenu_list = g_slist_remove (submenu_list, submenu_list->data);
 }
@@ -614,8 +640,10 @@ menu_nickinfo_cb (GtkWidget *menu, session *sess)
 	if (!is_session (sess))
 		return;
 
+	/* issue a /WHOIS */
 	g_snprintf (buf, sizeof (buf), "WHOIS %s %s", str_copy, str_copy);
 	handle_command (sess, buf, FALSE);
+	/* and hide the output */
 	sess->server->skip_next_whois = 1;
 }
 
@@ -625,6 +653,7 @@ copy_to_clipboard_cb (GtkWidget *item, char *url)
 	gtkutil_copy_to_clipboard (item, NULL, url);
 }
 
+/* returns boolean: Some data is missing */
 
 static gboolean
 menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
@@ -636,6 +665,7 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
 	gboolean missing = FALSE;
 	GtkWidget *item;
 
+	/* let the translators tweak this if need be */
 	fmt = _("<tt><b>%-11s</b></tt> %s");
 	g_snprintf (unknown, sizeof (unknown), "<i>%s</i>", _("Unknown"));
 
@@ -726,11 +756,14 @@ fe_userlist_update (session *sess, struct User *user)
 	if (!nick_submenu || !str_copy)
 		return;
 
+	/* not the same nick as the menu? */
 	if (sess->server->p_cmp (user->nick, str_copy))
 		return;
 
+	/* get rid of the "show" signal */
 	g_signal_handlers_disconnect_by_func (nick_submenu, menu_nickinfo_cb, sess);
 
+	/* destroy all the old items */
 	items = gtk_container_get_children (GTK_CONTAINER (nick_submenu));
 	iter = items;
 	while (iter)
@@ -741,6 +774,7 @@ fe_userlist_update (session *sess, struct User *user)
 	}
 	g_list_free (items);
 
+	/* and re-create them with new info */
 	needs_refresh = menu_create_nickinfo_menu (user, nick_submenu) ||
 		!user->hostname || !user->realname || !user->servername;
 
@@ -782,6 +816,7 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
 
 	submenu_list = 0;	/* first time through, might not be 0 */
 
+	/* more than 1 nick selected? */
 	if (num_sel > 1)
 	{
 		g_snprintf (buf, sizeof (buf), _("%d nicks selected."), num_sel);
@@ -826,6 +861,7 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
 	menu_popup (menu, event, NULL);
 }
 
+/* stuff for the View menu */
 
 static void
 menu_showhide_cb (session *sess)
@@ -989,6 +1025,7 @@ menu_fullscreen_toggle (GtkWidget *wid, gpointer ud)
 #ifdef WIN32
 		if (!prefs.hex_gui_win_state) /* not maximized */
 		{
+			/* other window managers seem to handle this */
 			gtk_window_resize (GTK_WINDOW (parent_window),
 				prefs.hex_gui_win_width, prefs.hex_gui_win_height);
 			gtk_window_move (GTK_WINDOW (parent_window),
@@ -1014,6 +1051,7 @@ open_url_cb (GtkWidget *item, char *url)
 {
 	char buf[512];
 
+	/* pass this to /URL so it can handle irc:// */
 	g_snprintf (buf, sizeof (buf), "URL %s", url);
 	handle_command (current_sess, buf, FALSE);
 }
@@ -1028,6 +1066,7 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	str_copy = g_strdup (url);
 
 	menu = menu_new ();
+	/* more than 51 chars? Chop it */
 	if (g_utf8_strlen (str_copy, -1) >= 52)
 	{
 		tmp = g_strdup (str_copy);
@@ -1042,12 +1081,14 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	}
 	menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);
 
+	/* Two hardcoded entries */
 	if (strncmp (str_copy, "irc://", 6) == 0 ||
 	    strncmp (str_copy, "ircs://",7) == 0)
 		menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
 	else
 		menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
 	menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
+	/* custom ones from urlhandlers.conf */
 	menu_create (menu, urlhandler_list, str_copy, TRUE);
 	menu_add_plugin_items (menu, "\x4$URL", str_copy);
 	menu_popup (menu, event, NULL);
@@ -1315,6 +1356,7 @@ menu_newserver_tab (GtkWidget * wid, gpointer none)
 	int oldf = prefs.hex_gui_tab_newtofront;
 
 	prefs.hex_gui_tab_chans = 1;
+	/* force focus if setting is "only requested tabs" */
 	if (prefs.hex_gui_tab_newtofront == 2)
 		prefs.hex_gui_tab_newtofront = 1;
 	new_ircwindow (NULL, NULL, SESS_SERVER, 0);
@@ -1698,67 +1740,10 @@ menu_ctcpguiopen (void)
 	editlist_gui_open (NULL, NULL, ctcp_list, buf, "ctcpreply", "ctcpreply.conf", ctcp_help);
 }
 
-/* Returns the index.html of a locally installed copy of the documentation,
- * or NULL if none is available. Callers own the returned string. */
-static char *
-menu_docs_local_index (void)
-{
-	const char *env_docdir;
-	char *path;
-
-	env_docdir = g_getenv ("ZOITECHAT_DOCDIR");
-	if (env_docdir && env_docdir[0])
-	{
-		path = g_build_filename (env_docdir, "index.html", NULL);
-		if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-			return path;
-		g_free (path);
-	}
-
-	/* Docs the user placed in the config dir; works on every platform,
-	 * including portable installs and Flatpak (host-readable, unlike /app) */
-	path = g_build_filename (get_xdir (), "offline-docs", "index.html", NULL);
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-		return path;
-	g_free (path);
-
-#ifdef WIN32
-	/* The installer's "Offline Documentation" component; ZOITECHATDOCDIR is
-	 * relative to the install dir on Windows and must not be resolved
-	 * against the CWD, which depends on how the app was launched */
-	if (!g_path_is_absolute (ZOITECHATDOCDIR))
-	{
-		char *install_dir = g_win32_get_package_installation_directory_of_module (NULL);
-
-		if (!install_dir)
-			return NULL;
-		path = g_build_filename (install_dir, ZOITECHATDOCDIR, "index.html", NULL);
-		g_free (install_dir);
-	}
-	else
-		path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
-#else
-	path = g_build_filename (ZOITECHATDOCDIR, "index.html", NULL);
-#endif
-	if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
-		return path;
-	g_free (path);
-
-	return NULL;
-}
-
 static void
 menu_docs (GtkWidget *wid, gpointer none)
 {
-	char *local_index = menu_docs_local_index ();
-
-	if (local_index)
-	{
-		fe_open_url (local_index);
-		g_free (local_index);
-	}
-	else
-		fe_open_url ("https://docs.zoitechat.org/en/latest/");
+	fe_open_url ("https://docs.zoitechat.org/en/latest/");
 }
 
 /*static void
@@ -2267,6 +2252,7 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
 	return gtk_widget_is_sensitive (widget);
 }
 
+/* === STUFF FOR /MENU === */
 
 static GtkMenuItem *
 menu_find_item (GtkWidget *menu, char *name)
@@ -2332,6 +2318,7 @@ menu_find_path (GtkWidget *menu, char *path)
 	char name[128];
 	int len;
 
+	/* grab the next part of the path */
 	s = strchr (path, '/');
 	len = s - path;
 	if (!s)
@@ -2385,6 +2372,7 @@ menu_foreach_gui (menu_entry *me, void (*callback) (GtkWidget *, menu_entry *, c
 			list = list->next;
 			continue;
 		}
+		/* do it only once for tab sessions, since they share a GUI */
 		if (!sess->gui->is_tab || !tabdone)
 		{
 			callback (sess->gui->menu, me, NULL);
@@ -2404,11 +2392,13 @@ menu_update_cb (GtkWidget *menu, menu_entry *me, char *target)
 	if (item)
 	{
 		gtk_widget_set_sensitive (item, me->enable);
+		/* must do it without triggering the callback */
 		if (GTK_IS_CHECK_MENU_ITEM (item))
 			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), me->state);
 	}
 }
 
+/* radio state changed via mouse click */
 static void
 menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
 {
@@ -2416,12 +2406,15 @@ menu_radio_cb (GtkCheckMenuItem *item, menu_entry *me)
 	if (gtk_check_menu_item_get_active (item))
 		me->state = 1;
 
+	/* update the state, incase this was changed via right-click. */
+	/* This will update all other windows and menu bars */
 	menu_foreach_gui (me, menu_update_cb);
 
 	if (me->state && me->cmd)
 		handle_command (current_sess, me->cmd, FALSE);
 }
 
+/* toggle state changed via mouse click */
 static void
 menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
 {
@@ -2429,6 +2422,8 @@ menu_toggle_cb (GtkCheckMenuItem *item, menu_entry *me)
 	if (gtk_check_menu_item_get_active (item))
 		me->state = 1;
 
+	/* update the state, incase this was changed via right-click. */
+	/* This will update all other windows and menu bars */
 	menu_foreach_gui (me, menu_update_cb);
 
 	if (me->state)
@@ -2599,6 +2594,7 @@ fe_menu_add (menu_entry *me)
 	if (!pango_parse_markup (me->label, -1, 0, NULL, &text, NULL, NULL))
 		return NULL;
 
+	/* return the label with markup stripped */
 	return text;
 }
 
@@ -2614,6 +2610,7 @@ fe_menu_update (menu_entry *me)
 	menu_foreach_gui (me, menu_update_cb);
 }
 
+/* used to add custom menus to the right-click menu */
 
 static void
 menu_add_plugin_mainmenu_items (GtkWidget *menu)
@@ -2647,6 +2644,7 @@ menu_add_plugin_items (GtkWidget *menu, char *root, char *target)
 	}
 }
 
+/* === END STUFF FOR /MENU === */
 
 GtkWidget *
 menu_create_main (void *accel_group, int bar, int away, int toplevel,
@@ -2679,11 +2677,13 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 	else
 		menu_bar = menu_new ();
 
+	/* /MENU needs to know this later */
 	g_object_set_data (G_OBJECT (menu_bar), "accel", accel_group);
 
 	g_signal_connect (G_OBJECT (menu_bar), "can-activate-accel",
 							G_CALLBACK (menu_canacaccel), 0);
 
+	/* set the initial state of toggles */
 	mymenu[MENUBAR_OFFSET].state = !prefs.hex_gui_hide_menu;
 	mymenu[MENUBAR_OFFSET+1].state = prefs.hex_gui_topicbar;
 	mymenu[MENUBAR_OFFSET+2].state = !prefs.hex_gui_ulist_hide;
@@ -2722,6 +2722,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 		mymenu[METRE_OFFSET+3].state = 1;
 	}
 
+	/* change Close binding to ctrl-shift-w when using emacs keys */
 	settings = gtk_widget_get_settings (menu_bar);
 	if (settings)
 	{
@@ -2737,6 +2738,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 		}
 	}
 
+	/* Away binding to ctrl-alt-a if the _Help menu conflicts (FR/PT/IT) */
 	{
 		char *help = _("_Help");
 		char *under = strchr (help, '_');
@@ -2773,6 +2775,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 			if (mymenu[i].id == MENU_ID_USERMENU)
 				usermenu = menu;
 			menu_item = gtk_menu_item_new_with_mnemonic (_(mymenu[i].text));
+			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (menu_item), "name", mymenu[i].text);
 #ifdef HAVE_GTK_MAC /* Added to app menu, see below */
 			if (!bar || mymenu[i].id != MENU_ID_ZOITECHAT)		
@@ -2824,6 +2827,7 @@ normalitem:
 togitem:
 			g_object_set_data (G_OBJECT (item), "zc-key-action", (gpointer) menu_get_key_action_name (i));
 			menu_add_keybinding_accel (item, accel_group, menu_get_key_action_name (i));
+			/* must avoid callback for Radio buttons */
 			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), mymenu[i].state);
 			/*gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
 													 mymenu[i].state);*/
@@ -2863,6 +2867,7 @@ togitem:
 			group = NULL;
 			submenu = menu_new ();
 			item = create_icon_menu (_(mymenu[i].text), mymenu[i].image, TRUE);
+			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (item), "name", mymenu[i].text);
 			gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
 			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -2884,10 +2889,13 @@ togitem:
 			submenu = NULL;
 		}
 
+		/* record this GtkWidget * so it's state might be changed later */
 		if (mymenu[i].id != 0 && menu_widgets)
+			/* this ends up in sess->gui->menu_item[MENU_ID_XXX] */
 			menu_widgets[mymenu[i].id] = item;
 
 #ifdef HAVE_GTK_MAC
+		/* We want ZoiteChat to be the app menu, not including Quit or ZoiteChat itself */
 		if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_ZOITECHAT)
 		{
 			if (!submenu || mymenu[i].type == M_MENUSUB)

src/fe-gtk/servlistgui.c

@@ -88,6 +88,7 @@ static GtkWidget *edit_entry_real;
 static GtkWidget *edit_entry_pass;
 static GtkWidget *edit_check_show_pass;
 static GtkWidget *edit_check_use_keyring;
+static GtkWidget *edit_check_ask_pass;
 static GtkWidget *edit_button_encrypt_pass;
 static GtkWidget *edit_button_import_pass;
 static int edit_pass_changed;
@@ -122,7 +123,11 @@ servlist_update_password_tools (ircnet *net)
 		return;
 
 	use_keyring = net && (net->flags & FLAG_USE_KEYRING);
-	has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed;
+	if ((net && (net->flags & FLAG_PROMPT_PASSWORD)) ||
+		(edit_check_ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass))))
+		use_keyring = FALSE;
+	has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed &&
+		(!edit_check_ask_pass || !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass)));
 	gtk_widget_set_sensitive (edit_button_encrypt_pass, has_local && !servlist_password_is_encrypted (net->pass));
 	gtk_widget_set_sensitive (edit_button_import_pass, has_local);
 }
@@ -135,6 +140,17 @@ servlist_entry_set_text_silent (GtkWidget *entry, const char *text)
 	g_signal_handlers_unblock_by_func (G_OBJECT (entry), G_CALLBACK (servlist_password_changed_cb), NULL);
 }
 
+static void
+servlist_toggle_ask_pass_cb (GtkToggleButton *toggle, gpointer userdata)
+{
+	gboolean active = gtk_toggle_button_get_active (toggle);
+
+	gtk_widget_set_sensitive (edit_check_use_keyring, !active);
+	gtk_widget_set_sensitive (edit_entry_pass, !active && (!selected_net || selected_net->logintype != LOGIN_SASLEXTERNAL));
+	gtk_widget_set_sensitive (edit_check_show_pass, !active);
+	servlist_update_password_tools (selected_net);
+}
+
 static char *
 servlist_display_password (ircnet *net)
 {
@@ -1261,6 +1277,7 @@ static void
 servlist_edit_update (ircnet *net)
 {
 	gboolean use_keyring;
+	gboolean ask_pass;
 	gboolean keyring_changed;
 	char *password = NULL;
 	servlist_update_from_entry (&net->nick, edit_entry_nick);
@@ -1269,8 +1286,23 @@ servlist_edit_update (ircnet *net)
 	servlist_update_from_entry (&net->real, edit_entry_real);
 	if (net && net->name)
 	{
-		use_keyring = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
+		ask_pass = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass));
+		use_keyring = !ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
 		keyring_changed = !!(net->flags & FLAG_USE_KEYRING) != !!use_keyring;
+		if (ask_pass)
+		{
+			secretstore_delete_network_password (net->name);
+			if (net->pass)
+			{
+				memset (net->pass, 0, strlen (net->pass));
+				g_free (net->pass);
+				net->pass = NULL;
+			}
+			net->flags &= ~FLAG_USE_KEYRING;
+			net->flags |= FLAG_PROMPT_PASSWORD;
+			return;
+		}
+		net->flags &= ~FLAG_PROMPT_PASSWORD;
 		if (!edit_pass_changed && !keyring_changed)
 			return;
 		if (edit_pass_changed)
@@ -1338,6 +1370,7 @@ servlist_edit_close_cb (GtkWidget *button, gpointer userdata)
 	edit_win = NULL;
 	edit_entry_pass = NULL;
 	edit_check_show_pass = NULL;
+	edit_check_ask_pass = NULL;
 	edit_button_encrypt_pass = NULL;
 	edit_button_import_pass = NULL;
 }
@@ -2565,7 +2598,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 
 
 	/* Checkboxes and entries */
-	table3 = gtkutil_grid_new (17, 2, FALSE);
+	table3 = gtkutil_grid_new (19, 2, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox5), table3, FALSE, FALSE, 0);
 	gtk_grid_set_row_spacing (GTK_GRID (table3), 2);
 	gtk_grid_set_column_spacing (GTK_GRID (table3), 8);
@@ -2584,34 +2617,43 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 #endif
 	servlist_create_check (1, net->flags & FLAG_USE_GLOBAL, table3, 5, 0, _("Use global user information"));
 
+	edit_check_ask_pass = gtk_check_button_new_with_mnemonic (_("Ask for password on connect"));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass), net->flags & FLAG_PROMPT_PASSWORD);
+	servlist_table_attach (table3, edit_check_ask_pass, 0, 2, 6, 7,
+					   FALSE, FALSE,
+					   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
+					   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
+	g_signal_connect (G_OBJECT (edit_check_ask_pass), "toggled",
+				  G_CALLBACK (servlist_toggle_ask_pass_cb), NULL);
+
 	edit_check_use_keyring = gtk_check_button_new_with_mnemonic (_("Use system keyring"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring), net->flags & FLAG_USE_KEYRING);
-	servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 6, 7,
+	servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 7, 8,
 					   FALSE, FALSE,
 					   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 					   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	g_signal_connect (G_OBJECT (edit_check_use_keyring), "toggled",
 				  G_CALLBACK (servlist_toggle_keyring_cb), NULL);
 
-	edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 7, net->nick, &edit_label_nick, 0);
-	edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 8, net->nick2, &edit_label_nick2, 0);
-	edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 9, net->real, &edit_label_real, 0);
-	edit_entry_user = servlist_create_entry (table3, _("_User name:"), 10, net->user, &edit_label_user, 0);
+	edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 8, net->nick, &edit_label_nick, 0);
+	edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 9, net->nick2, &edit_label_nick2, 0);
+	edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 10, net->real, &edit_label_real, 0);
+	edit_entry_user = servlist_create_entry (table3, _("_User name:"), 11, net->user, &edit_label_user, 0);
 
 	label_logintype = gtk_label_new (_("Login method:"));
-	servlist_table_attach (table3, label_logintype, 0, 1, 11, 12,
+	servlist_table_attach (table3, label_logintype, 0, 1, 12, 13,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	gtk_widget_set_halign (label_logintype, GTK_ALIGN_START);
 	gtk_widget_set_valign (label_logintype, GTK_ALIGN_CENTER);
 	combobox_logintypes = servlist_create_logintypecombo (notebook);
-	servlist_table_attach (table3, combobox_logintypes, 1, 2, 11, 12,
+	servlist_table_attach (table3, combobox_logintypes, 1, 2, 12, 13,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
 						   4, 2);
 
-	edit_entry_pass = servlist_create_entry (table3, _("Password:"), 12, NULL, 0, _("Password used for login. If in doubt, leave blank."));
+	edit_entry_pass = servlist_create_entry (table3, _("Password:"), 13, NULL, 0, _("Password used for login. If in doubt, leave blank."));
 	if (edit_loaded_password)
 	{
 		memset (edit_loaded_password, 0, strlen (edit_loaded_password));
@@ -2644,7 +2686,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	if (selected_net && selected_net->logintype == LOGIN_SASLEXTERNAL)
 		gtk_widget_set_sensitive (edit_entry_pass, FALSE);
 	edit_check_show_pass = gtk_check_button_new_with_mnemonic (_("Show password"));
-	servlist_table_attach (table3, edit_check_show_pass, 0, 2, 13, 14,
+	servlist_table_attach (table3, edit_check_show_pass, 0, 2, 14, 15,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   4, 2);
@@ -2652,14 +2694,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 					  G_CALLBACK (servlist_toggle_show_password_cb), edit_entry_pass);
 
 	edit_button_encrypt_pass = gtk_button_new_with_mnemonic (_("Encrypt saved password"));
-	servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 14, 15,
+	servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 15, 16,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	g_signal_connect (G_OBJECT (edit_button_encrypt_pass), "clicked",
 					  G_CALLBACK (servlist_encrypt_password_cb), net);
 	edit_button_import_pass = gtk_button_new_with_mnemonic (_("Move password to keyring"));
-	servlist_table_attach (table3, edit_button_import_pass, 1, 2, 14, 15,
+	servlist_table_attach (table3, edit_button_import_pass, 1, 2, 15, 16,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   4, 2);
@@ -2667,14 +2709,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 					  G_CALLBACK (servlist_import_password_cb), net);
 
 	label34 = gtk_label_new (_("Character set:"));
-	servlist_table_attach (table3, label34, 0, 1, 15, 16,
+	servlist_table_attach (table3, label34, 0, 1, 16, 17,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	gtk_widget_set_halign (label34, GTK_ALIGN_START);
 	gtk_widget_set_valign (label34, GTK_ALIGN_CENTER);
 	comboboxentry_charset = servlist_create_charsetcombo ();
-	servlist_table_attach (table3, comboboxentry_charset, 1, 2, 15, 16,
+	servlist_table_attach (table3, comboboxentry_charset, 1, 2, 16, 17,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
 						   4, 2);
@@ -2700,7 +2742,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 							G_CALLBACK (servlist_delete_client_cert_cb), net);
 	gtk_box_pack_start (GTK_BOX (hbox_cert_buttons), edit_button_cert_delete, FALSE, FALSE, 0);
 
-	servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 16, 17,
+	servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 17, 18,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);

src/fe-text/fe-text.c

@@ -857,6 +857,10 @@ fe_get_str (char *prompt, char *def, void *callback, void *ud)
 {
 }
 void
+fe_get_password (char *prompt, void *callback, void *ud)
+{
+}
+void
 fe_get_int (char *prompt, int def, void *callback, void *ud)
 {
 }

win32/config.h.tt

@@ -9,7 +9,6 @@
 #define PACKAGE_VERSION "<#= [string]::Join('.', $versionParts) #>"
 #define ZOITECHATLIBDIR ".\\plugins"
 #define ZOITECHATSHAREDIR "."
-#define ZOITECHATDOCDIR "offline-docs"
 #define OLD_PERL
 #define GETTEXT_PACKAGE "zoitechat"
 #define PACKAGE_TARNAME "zoitechat-<#= [string]::Join('.', $versionParts) #>"

win32/installer/zoitechat.iss.tt

@@ -49,7 +49,6 @@ Name: "icons"; Description: "Create Shortcuts"; Types: custom; Flags: disablenou
 Name: "icons\desktopicon"; Description: "Create Desktop Shortcut"; Types: custom; Flags: disablenouninstallwarning
 Name: "icons\quicklaunchicon"; Description: "Create Quick Launch Shortcut"; Types: custom; Flags: disablenouninstallwarning
 Name: "translations"; Description: "Translations"; Types: normal custom; Flags: disablenouninstallwarning
-Name: "docs"; Description: "Offline Documentation"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "spell"; Description: "Spelling Dictionaries"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins"; Description: "Plugins"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\checksum"; Description: "Checksum"; Types: custom; Flags: disablenouninstallwarning
@@ -110,9 +109,6 @@ Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; F
 Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\icons\hicolor\*"; DestDir: "{app}\share\icons\hicolor"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
-; Staged at build time by data\misc\build_offline_docs.py; absent when the
-; docs could not be built, in which case Help->Contents opens the website
-Source: "offline-docs\*"; DestDir: "{app}\offline-docs"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: docs
 Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 
 Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs