[Xfce4-commits] <postler:master> Say that msmtp can't be executed rather than $SHELL

[Christian Dywan]

Updating branch refs/heads/master
         to 37897cd646fa1ebaff9eaa29455d145a4b042ae0 (commit)
       from 42139b4ae7c8ddcdc7c61d77896b667d2e6517f5 (commit)

commit 37897cd646fa1ebaff9eaa29455d145a4b042ae0
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Feb 27 04:01:17 2011 +0100

    Say that msmtp can't be executed rather than $SHELL
    
    Fixes: https://bugs.launchpad.net/postler/+bug/725455

 postler/postler-service.vala |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/postler/postler-service.vala b/postler/postler-service.vala
index 09466b9..519dbd2 100644
--- a/postler/postler-service.vala
+++ b/postler/postler-service.vala
@@ -359,8 +359,16 @@ namespace Postler {
                                 helper.finnish (line);
                         });
                         helper.done.connect ((error_message) => {
-                            sent (account, filename,
-                                (error_message ?? "").replace ("msmtp: ", ""));
+                            unowned string shell = Environment.get_variable ("SHELL");
+                            if (error_message.has_prefix (shell + ": ")) {
+                                /* i18n: A command line tool, eg. msmtp, is missing */
+                                sent (account, filename,
+                                      _("%s couldn't be executed.").printf ("msmtp"));
+                            }
+                            else {
+                                sent (account, filename,
+                                    (error_message ?? "").replace ("msmtp: ", ""));
+                            }
                         });
                         helper.execute (command);
                         return;