GUI: small reorganization in report message dialog

1 files changed, 9 insertions, 17 deletions

diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index c85a329..7722fcc 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -298,6 +298,8 @@ string CTicketUploader::Report(const map_crash_data_t& pCrashData,
         msg += "Please copy this into ticket: ";
         msg += ticket_name;
         msg += '\n';
+        msg += "========cut here=========";
+        msg += '\n';
     }
     else
     {
@@ -321,35 +323,25 @@ string CTicketUploader::Report(const map_crash_data_t& pCrashData,
     }
     msg += "FILE: ";
     msg += outfile_basename;
-    msg += "\nMD5SUM:\n";
+    msg += "\nMD5SUM:";
     msg += md5sum;
+    msg += '\n';
     if (do_encrypt)
     {
         msg += "KEY: aes-128-cbc\n";
         msg += key;
+        msg += '\n';
     }
-    msg += "END:\n";
+    msg += "==========end===========\n";
 
     // warn the client (why _warn_? it's not an error, maybe update_client?):
-    error_msg("%s", msg.c_str());
-
-    string ret;
-    if (do_upload)
-    {
-        ret = _("report sent to ") + upload_url + '/' + outfile_basename;
-        update_client("%s", ret.c_str());
-    }
-    else
-    {
-        ret = _("report copied to /tmp/") + outfile_basename;
-        update_client("%s", ret.c_str());
-    }
-
+    //error_msg("%s", msg.c_str());
+    
     // delete the temporary directory
     cmd = ssprintf("rm -rf %s", tmpdir_name);
     RunCommand(cmd.c_str());
 
-    return ret;
+    return msg;
 }
 
 static bool is_string_safe(const char *str)