]> gitweb.michael.orlitzky.com - xfce4-hdaps.git/commitdiff
xfce4-hdaps-dialogs.c: remove redundant double-launch.
authorMichael Orlitzky <michael@orlitzky.com>
Sat, 26 Oct 2019 15:18:05 +0000 (11:18 -0400)
committerMichael Orlitzky <michael@orlitzky.com>
Sat, 26 Oct 2019 15:18:05 +0000 (11:18 -0400)
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

index 4a995df484056e4cbfa2dbba8bb23266d1bb734f..5ac786051e2dfde205f0fc1b9b56e6a8ed8a2fb5 100644 (file)
@@ -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);
 }