[Xfce4-commits] <xfce4-mount-plugin:master> cleaned up more incorrect, inconsistent error dialogs

[Fabian]

Updating branch refs/heads/master
         to a5a57fd35316572d645587218a6f70ab01e8cddc (commit)
       from 23e348007d29fb649f48563ebe09ed88233d306c (commit)

commit a5a57fd35316572d645587218a6f70ab01e8cddc
Author: Fabian <timystery at arcor.de>
Date:   Sun May 13 21:14:18 2012 +0200

    cleaned up more incorrect, inconsistent error dialogs

 panel-plugin/devices.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
index 00787c7..f29acda 100644
--- a/panel-plugin/devices.c
+++ b/panel-plugin/devices.c
@@ -279,7 +279,7 @@ disk_mount (t_disk *pdisk, char *on_mount_cmd, char* mount_command, gboolean eje
             /* show error message if smth failed */
             //xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin:\n\nError executing command."),
                 //_("Return value:"), WEXITSTATUS(exit_status), _("\nError was:"), erroutput);
-            xfce_dialog_show_error (NULL, error, "%s %s", _("Failed to mount device"), pdisk->device);
+            xfce_dialog_show_error (NULL, error, _("Failed to mount device \"%s\"."), pdisk->device);
             goto out;
         }
 
@@ -294,7 +294,7 @@ disk_mount (t_disk *pdisk, char *on_mount_cmd, char* mount_command, gboolean eje
             DBG("cmd: '%s', returned %d", cmd, val);
             /* show error message if smth failed */
             if (val == FALSE)
-                xfce_dialog_show_error (NULL, error, "%s", _("Mount Plugin:\n\nError executing on-mount command."));
+                xfce_dialog_show_error (NULL, error, _("Error executing on-mount command \"%s\"."), on_mount_cmd);
         }
 out:
         g_free(cmd);
@@ -342,8 +342,9 @@ out:
             g_free(tmp);
         /* show error message if smth failed */
         if (val == FALSE || exit_status != 0)
-            xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin: Error executing command."),
-                _("Returned"), WEXITSTATUS(exit_status), _("error was"), erroutput);
+            //xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin: Error executing command."),
+                //_("Returned"), WEXITSTATUS(exit_status), _("error was"), erroutput);
+            xfce_dialog_show_error (NULL, error, _("Failed to umount device \"%s\"."), pdisk->device);
 
         if (show_message_dialog && !eject && val == TRUE && exit_status == 0)
             xfce_dialog_show_info (NULL, NULL, _("The device \"%s\" should be removable safely now."), pdisk->device);