]> gitweb.michael.orlitzky.com - xfce4-hdaps.git/blobdiff - panel-plugin/xfce4-hdaps-dialogs.c
xfce4-hdaps-dialogs.c: remove redundant double-launch.
[xfce4-hdaps.git] / panel-plugin / xfce4-hdaps-dialogs.c
index 6a7fff98b41179baae678fb80975403af409794f..5ac786051e2dfde205f0fc1b9b56e6a8ed8a2fb5 100644 (file)
@@ -45,9 +45,8 @@ static void hdaps_configure_response(GtkWidget   *dialog,
                                      HdapsPlugin *hdaps) {
 
   if (response == GTK_RESPONSE_HELP) {
-    /* Launch the user's web browser and direct them to
-       the plugin's webpage. */
-    gboolean spawn_result = g_spawn_command_line_async("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL);
+    /* Launch the user's web browser and direct them to the plugin webpage. */
+    gboolean spawn_result = g_spawn_command_line_async("xdg-open " PLUGIN_WEBSITE, NULL);
 
     if (G_UNLIKELY(spawn_result == FALSE)) {
       g_warning(_("Unable to open the following url: %s"), PLUGIN_WEBSITE);
@@ -204,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);
 }