Relax freedesktop notification DBus timeouts

Use native file chooser dialogs everywhere

.github/workflows/appimage-build.yml

@@ -29,7 +29,6 @@ jobs:
             build-essential pkg-config meson ninja-build cmake \
             gettext \
             libcanberra-dev libglib2.0-dev \
-            libminiupnpc-dev \
             libarchive-dev \
             libgtk-3-dev \
             libwayland-client0 libwayland-cursor0 libwayland-egl1 \

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

@@ -33,7 +33,6 @@ jobs:
             gtk3 \
             openssl \
             libcanberra \
-            miniupnpc \
             libayatana-appindicator \
             iso-codes \
             lua \

meson.build

@@ -18,8 +18,6 @@ libgmodule_dep = dependency('gmodule-2.0')
 
 libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
                              required: get_option('libcanberra'))
-miniupnpc_dep = dependency('miniupnpc', version: '>= 2.0.0',
-                           required: get_option('miniupnpc'))
 dbus_dep = dependency('gio-2.0', required: get_option('dbus'))
 
 global_deps = []
@@ -42,7 +40,6 @@ config_h.set10('ENABLE_NLS', true)
 config_h.set('USE_OPENSSL', libssl_dep.found())
 config_h.set('USE_LIBCANBERRA', libcanberra_dep.found())
 config_h.set('USE_DBUS', dbus_dep.found())
-config_h.set('USE_MINIUPNPC', miniupnpc_dep.found())
 config_h.set('USE_PLUGIN', get_option('plugin'))
 config_h.set('USE_GTK_FRONTEND', get_option('gtk-frontend'))
 
@@ -186,7 +183,6 @@ if meson.version().version_compare('>= 0.55.0')
     'Plugin Support': get_option('plugin'),
     'DBus Support': dbus_dep.found(),
     'libcanberra': libcanberra_dep.found(),
-    'miniupnpc': miniupnpc_dep.found(),
   }, section: 'Features')
 
   summary({

meson_options.txt

@@ -19,9 +19,6 @@ option('dbus', type: 'feature', value: 'auto',
 option('libcanberra', type: 'feature', value: 'auto',
   description: 'Support for sound alerts, Unix only'
 )
-option('miniupnpc', type: 'feature', value: 'auto',
-  description: 'Support for DCC Universal Plug & Play, Unix only'
-)
 option('appindicator', type: 'feature', value: 'auto',
   description: 'Use Ayatana/AppIndicator-based tray backend for GTK frontend (non-Windows only)'
 )

packaging/manjaro/PKGBUILD

@@ -13,7 +13,6 @@ depends=(
   'iso-codes'
   'libayatana-appindicator'
   'libcanberra'
-  'miniupnpc'
   'lua'
   'openssl'
   'perl'

src/common/cfgfiles.c

@@ -562,7 +562,6 @@ const struct prefs vars[] =
 	{"net_proxy_user", P_OFFSET (hex_net_proxy_user), TYPE_STR},
 	{"net_reconnect_delay", P_OFFINT (hex_net_reconnect_delay), TYPE_INT},
 	{"net_throttle", P_OFFINT (hex_net_throttle), TYPE_BOOL},
-	{"net_upnp", P_OFFINT (hex_net_upnp), TYPE_BOOL},
 
 	{"notify_timeout", P_OFFINT (hex_notify_timeout), TYPE_INT},
 	{"notify_whois_online", P_OFFINT (hex_notify_whois_online), TYPE_BOOL},
@@ -812,7 +811,6 @@ load_default_config(void)
 	prefs.hex_irc_whois_front = 1;
 	prefs.hex_net_auto_reconnect = 1;
 	prefs.hex_net_throttle = 1;
-	prefs.hex_net_upnp = 1;
 	prefs.hex_stamp_log = 1;
 	prefs.hex_stamp_text = 1;
 	prefs.hex_text_autocopy_text = 1;

src/common/common.vcxproj

@@ -74,7 +74,6 @@
     <ClCompile Include="sysinfo\win32\backend.c" />
     <ClCompile Include="text.c" />
     <ClCompile Include="tree.c" />
-    <ClCompile Include="upnp.c" />
     <ClCompile Include="url.c" />
     <ClCompile Include="userlist.c" />
     <ClCompile Include="util.c" />

src/common/common.vcxproj.filters

@@ -190,9 +190,6 @@
     <ClCompile Include="tree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="upnp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="url.c">
       <Filter>Source Files</Filter>
     </ClCompile>

src/common/dcc.c

@@ -57,7 +57,6 @@
 #include "text.h"
 #include "url.h"
 #include "zoitechatc.h"
-#include "upnp.h"
 
 /* Setting _FILE_OFFSET_BITS to 64 doesn't change lseek to use off64_t on Windows, so override lseek to the version that does */
 #if defined(WIN32) && (!defined(__MINGW32__) && !defined(__MINGW64__))
@@ -372,12 +371,6 @@ dcc_connect_sok (struct DCC *dcc)
 static void
 dcc_close (struct DCC *dcc, enum dcc_state dccstat, int destroy)
 {
-	if (dcc->port > 0)
-	{
-		if (prefs.hex_net_upnp)
-			upnp_rem_redir(dcc->port);
-	}
-
 	if (dcc->wiotag)
 	{
 		fe_input_remove (dcc->wiotag);
@@ -1718,8 +1711,6 @@ dcc_listen_init (struct DCC *dcc, session *sess)
 	set_blocking (dcc->sok);
 
 	dcc->iotag = fe_input_add (dcc->sok, FIA_READ|FIA_EX, dcc_accept, dcc);
-	if (prefs.hex_net_upnp)
-		upnp_add_redir(inet_ntoa(SAddr.sin_addr), dcc->port);
 
 	return TRUE;
 }

src/common/meson.build

@@ -24,8 +24,7 @@ common_sources = [
   'tree.c',
   'url.c',
   'userlist.c',
-  'util.c',
-  'upnp.c'
+  'util.c'
 ]
 
 common_sysinfo_deps = []
@@ -116,10 +115,6 @@ if libssl_dep.found()
   common_deps += libssl_dep
 endif
 
-if miniupnpc_dep.found()
-  common_deps += miniupnpc_dep
-endif
-
 if dbus_dep.found()
   subdir('dbus')
   common_deps += zoitechat_dbus_dep

src/common/upnp.c

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

src/common/upnp.h

@@ -1,14 +0,0 @@
-/*
- * Copyright (C) Thomas Bernard
- * Copyright (C) HexChat contributors
- * Copyright (C) ZoiteChat contributors
- */
-
-#ifndef ZOITECHAT_UPNP_H
-#define ZOITECHAT_UPNP_H
-
-void upnp_init(void);
-void upnp_add_redir(const char *addr, int port);
-void upnp_rem_redir(int port);
-
-#endif

src/common/zoitechat.c

@@ -54,7 +54,6 @@
 #include "text.h"
 #include "url.h"
 #include "zoitechatc.h"
-#include "upnp.h"
 
 #if ! GLIB_CHECK_VERSION (2, 36, 0)
 #include <glib-object.h>			/* for g_type_init() */
@@ -962,8 +961,6 @@ xchat_init (void)
 	sound_load ();
 	notify_load ();
 	ignore_load ();
-	if (prefs.hex_net_upnp)
-		upnp_init ();
 	sts_init ();
 
 	g_snprintf (buf, sizeof (buf),

src/common/zoitechat.h

@@ -202,7 +202,6 @@ struct zoitechatprefs
 	unsigned int hex_net_auto_reconnectonfail;
 	unsigned int hex_net_proxy_auth;
 	unsigned int hex_net_throttle;
-	unsigned int hex_net_upnp;
 	unsigned int hex_notify_whois_online;
 	unsigned int hex_perl_warnings;
 	unsigned int hex_stamp_log;

src/fe-gtk/gtkutil.c

@@ -272,13 +272,6 @@ gtkutil_apply_palette (GtkWidget *widget, const GdkRGBA *bg, const GdkRGBA *fg,
 	theme_manager_apply_palette_widget (widget, bg, fg, font_desc);
 }
 
-static void
-gtkutil_file_req_destroy (GtkWidget * wid, struct file_req *freq)
-{
-	freq->callback (freq->userdata, NULL);
-	g_free (freq);
-}
-
 static void
 gtkutil_check_file (char *filename, struct file_req *freq)
 {
@@ -390,26 +383,6 @@ gtkutil_file_req_done_chooser (GtkFileChooser *fs, struct file_req *freq)
 
 }
 
-static void
-gtkutil_file_req_done (GtkWidget * wid, struct file_req *freq)
-{
-	gtkutil_file_req_done_chooser (GTK_FILE_CHOOSER (freq->dialog), freq);
-	gtk_widget_destroy (freq->dialog);
-}
-
-static void
-gtkutil_file_req_response (GtkWidget *dialog, gint res, struct file_req *freq)
-{
-	if (res == GTK_RESPONSE_ACCEPT)
-	{
-		gtkutil_file_req_done (dialog, freq);
-		return;
-	}
-
-	gtk_widget_destroy (dialog);
-}
-
-#ifdef WIN32
 static gboolean
 gtkutil_native_dialog_unref_idle (gpointer native)
 {
@@ -423,27 +396,16 @@ gtkutil_native_file_req_response (GtkNativeDialog *dialog, gint res, struct file
 	if (res == GTK_RESPONSE_ACCEPT)
 		gtkutil_file_req_done_chooser (GTK_FILE_CHOOSER (dialog), freq);
 
-	/* Match gtk dialog flow by always sending NULL to indicate completion. */
 	freq->callback (freq->userdata, NULL);
 	g_free (freq);
-
-	/*
-	 * Defer unref until idle to avoid disposing the native chooser while
-	 * still in the button-release signal stack on Windows.
-	 */
 	g_idle_add (gtkutil_native_dialog_unref_idle, dialog);
 }
-#endif
 
 void
 gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *userdata, char *filter, char *extensions,
 						int flags)
 {
 	struct file_req *freq;
-	GtkWidget *dialog;
-	GtkFileFilter *filefilter;
-	char *token;
-	char *tokenbuffer;
 	const char *xdir;
 	GtkWindow *effective_parent = parent;
 
@@ -453,7 +415,6 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
 
 	xdir = get_xdir ();
 
-#ifdef WIN32
 	{
 		GtkFileChooserNative *native = gtk_file_chooser_native_new (
 			title,
@@ -529,107 +490,7 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
 		gtk_native_dialog_show (GTK_NATIVE_DIALOG (native));
 		return;
 	}
-#endif
 
-	if (flags & FRF_WRITE)
-	{
-		dialog = gtk_file_chooser_dialog_new (title, NULL,
-												GTK_FILE_CHOOSER_ACTION_SAVE,
-												_("_Cancel"), GTK_RESPONSE_CANCEL,
-												_("_Save"), GTK_RESPONSE_ACCEPT,
-												NULL);
-
-		if (!(flags & FRF_NOASKOVERWRITE))
-			gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
-	}
-	else
-		dialog = gtk_file_chooser_dialog_new (title, NULL,
-												GTK_FILE_CHOOSER_ACTION_OPEN,
-												_("_Cancel"), GTK_RESPONSE_CANCEL,
-												_("_Open"), GTK_RESPONSE_ACCEPT,
-												NULL);
-
-	theme_manager_attach_window (dialog);
-
-	if (filter && filter[0] && (flags & FRF_FILTERISINITIAL))
-	{
-		if (flags & FRF_WRITE)
-		{
-			char temp[1024];
-			path_part (filter, temp, sizeof (temp));
-			if (temp[0] && g_file_test (temp, G_FILE_TEST_IS_DIR))
-				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), temp);
-			else if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
-				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
-			gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), file_part (filter));
-		}
-		else
-		{
-			if (g_file_test (filter, G_FILE_TEST_IS_DIR))
-				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), filter);
-			else if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
-				gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
-		}
-	}
-	else if (!(flags & FRF_RECENTLYUSED))
-	{
-		if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
-			gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
-	}
-
-	if (flags & FRF_MULTIPLE)
-		gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	if (flags & FRF_CHOOSEFOLDER)
-		gtk_file_chooser_set_action (GTK_FILE_CHOOSER (dialog), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-
-	if ((flags & FRF_EXTENSIONS || flags & FRF_MIMETYPES) && extensions != NULL)
-	{
-		filefilter = gtk_file_filter_new ();
-		tokenbuffer = g_strdup (extensions);
-		token = strtok (tokenbuffer, ";");
-
-		while (token != NULL)
-		{
-			if (flags & FRF_EXTENSIONS)
-				gtk_file_filter_add_pattern (filefilter, token);
-			else
-				gtk_file_filter_add_mime_type (filefilter, token);
-			token = strtok (NULL, ";");
-		}
-
-		g_free (tokenbuffer);
-		gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filefilter);
-	}
-
-	if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
-	{
-		GError *shortcut_error = NULL;
-
-		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), xdir, &shortcut_error);
-		if (shortcut_error)
-			g_error_free (shortcut_error);
-	}
-	freq = g_new (struct file_req, 1);
-	freq->dialog = dialog;
-	freq->flags = flags;
-	freq->callback = callback;
-	freq->userdata = userdata;
-
-	g_signal_connect (G_OBJECT (dialog), "response",
-							G_CALLBACK (gtkutil_file_req_response), freq);
-	g_signal_connect (G_OBJECT (dialog), "destroy",
-						   G_CALLBACK (gtkutil_file_req_destroy), (gpointer) freq);
-
-	if (effective_parent)
-		gtk_window_set_transient_for (GTK_WINDOW (dialog), effective_parent);
-
-	if (flags & FRF_MODAL)
-	{
-		g_assert (effective_parent);
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	}
-
-	gtk_widget_show (dialog);
 }
 
 static gboolean

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

@@ -75,7 +75,7 @@ notification_backend_show (const char *title, const char *text)
                        "Notify",
                        g_variant_builder_end (&params),
                        G_DBUS_CALL_FLAGS_NONE,
-                       1000,
+                       -1,
                        NULL,
                        (GAsyncReadyCallback)on_notify_ready,
                        NULL);
@@ -108,7 +108,7 @@ notification_backend_init (const char **error)
                                        "GetCapabilities",
                                        NULL,
                                        G_DBUS_CALL_FLAGS_NONE,
-                                       30,
+                                       1000,
                                        NULL,
                                        &err);
 

src/fe-gtk/setup.c

@@ -650,7 +650,7 @@ static const setting network_settings[] =
         {ST_NUMBER,     N_("First DCC listen port:"), P_OFFINTNL(hex_dcc_port_first), 0, 0, 65535},
         {ST_NUMBER,     N_("Last DCC listen port:"), P_OFFINTNL(hex_dcc_port_last), 0, 
                 (const char **)N_("!Leave ports at zero for full range."), 65535},
-        {ST_TOGGLE, N_("Enable UPnP port mapping for DCC"), P_OFFINTNL(hex_net_upnp), 0, 0, 0},
+
         {ST_HEADER,     N_("Proxy Server"), 0, 0, 0, 0},
         {ST_ENTRY,      N_("Hostname:"), P_OFFSETNL(hex_net_proxy_host), 0, 0, sizeof prefs.hex_net_proxy_host},
         {ST_NUMBER,     N_("Port:"), P_OFFINTNL(hex_net_proxy_port), 0, 0, 65535},

src/fe-gtk/xtext.c

@@ -2300,6 +2300,12 @@ gtk_xtext_leave_notify (GtkWidget * widget, GdkEventCrossing * event)
 		xtext->hilight_ent = NULL;
 	}
 
+	if (xtext->tooltip_stamp_set)
+	{
+		gtk_widget_set_tooltip_text (widget, NULL);
+		xtext->tooltip_stamp_set = FALSE;
+	}
+
 	return FALSE;
 }
 
@@ -2466,7 +2472,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
 	}
 
 	if (xtext->urlcheck_function == NULL)
-		return FALSE;
+		goto tooltip_check;
 
 	word_type = gtk_xtext_get_word_adjust (xtext, x, y, &word_ent, &offset, &len);
 	if (word_type > 0)
@@ -2504,6 +2510,46 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
 		return FALSE;
 	}
 
+tooltip_check:
+	if (xtext->buffer->time_stamp && xtext->buffer->indent > 0 && x >= 0 && x < xtext->stamp_width)
+	{
+		textentry *ent = gtk_xtext_find_char (xtext, x, y, NULL, NULL);
+		if (ent && (!xtext->tooltip_stamp_set || xtext->tooltip_stamp != ent->stamp))
+		{
+			char tooltip[96];
+			strftime_utf8 (tooltip, sizeof (tooltip), "%Y-%m-%d", ent->stamp);
+			gtk_widget_set_tooltip_text (widget, tooltip);
+			xtext->tooltip_stamp = ent->stamp;
+			xtext->tooltip_stamp_set = TRUE;
+		}
+		if (ent)
+			return FALSE;
+	}
+	else if (!xtext->buffer->time_stamp && x >= xtext->buffer->indent)
+	{
+		textentry *ent = gtk_xtext_find_char (xtext, x, y, NULL, NULL);
+		if (ent && ent->stamp && (!xtext->tooltip_stamp_set || xtext->tooltip_stamp != ent->stamp))
+		{
+			char tooltip[128];
+			char date[64];
+			char *stamp_text;
+			strftime_utf8 (date, sizeof (date), "%Y-%m-%d", ent->stamp);
+			xtext_get_stamp_str (ent->stamp, &stamp_text);
+			g_snprintf (tooltip, sizeof (tooltip), "%s %s", date, stamp_text);
+			gtk_widget_set_tooltip_text (widget, tooltip);
+			g_free (stamp_text);
+			xtext->tooltip_stamp = ent->stamp;
+			xtext->tooltip_stamp_set = TRUE;
+		}
+		if (ent)
+			return FALSE;
+	}
+	else if (xtext->tooltip_stamp_set)
+	{
+		gtk_widget_set_tooltip_text (widget, NULL);
+		xtext->tooltip_stamp_set = FALSE;
+	}
+
 	gtk_xtext_leave_notify (widget, NULL);
 
 	return FALSE;

src/fe-gtk/xtext.h

@@ -190,6 +190,8 @@ struct _GtkXText
 	textentry *hilight_ent;
 	int hilight_start;
 	int hilight_end;
+	time_t tooltip_stamp;
+	unsigned int tooltip_stamp_set:1;
 
 	guint16 fontwidth[128];	  /* each char's width, only the ASCII ones */