From e12029299b67c2f2391d12e0aa1b7ae2eb660b0f Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 26 Oct 2019 11:18:05 -0400 Subject: [PATCH] xfce4-hdaps-dialogs.c: remove redundant double-launch. There was a fallback condition in one of our URI handlers that fell back to the same thing that just failed. Instead of that genius idea, it now reports an error, which is what the other URI handler within the plugin does too. --- panel-plugin/xfce4-hdaps-dialogs.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index 4a995df..5ac7860 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -203,15 +203,14 @@ void hdaps_configure(XfcePanelPlugin *plugin, static void hdaps_uri_handler(GtkAboutDialog *about, const gchar *uri, gpointer data) { - gchar *cmd; - cmd = g_strdup_printf("%s %s","xdg-open", uri); + gchar *cmd = g_strdup_printf("%s %s","xdg-open", uri); + gboolean spawn_result = g_spawn_command_line_async(cmd, NULL); - if (!g_spawn_command_line_async(cmd, NULL)) { - g_free(cmd); - cmd = g_strdup_printf("%s %s","xdg-open", uri); - g_spawn_command_line_async(cmd, NULL); + if (G_UNLIKELY(spawn_result == FALSE)) { + g_warning(_("Unable to open the following uri: %s"), uri); } + g_free(cmd); } -- 2.43.2