From e5b51c247ac5aba7f7eb1e79a6b1f43bded0f738 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 23 Mar 2006 20:23:22 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9715
---
 api/boinc_api.C          | 10 ++++------
 checkin_notes            | 11 +++++++++++
 clientgui/BOINCTaskBar.h |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/api/boinc_api.C b/api/boinc_api.C
index 2cbaf2d942..0595bfbfe5 100644
--- a/api/boinc_api.C
+++ b/api/boinc_api.C
@@ -620,16 +620,14 @@ static void handle_process_control_msg() {
         if (match_tag(buf, "<abort/>")) {
             boinc_status.abort_request = true;
             if (options.direct_process_action) {
-#ifdef _WIN32
-                diagnostics_set_aborted_via_gui_flag();
+#if   defined(_WIN32)
                 // Cause a controlled assert and dump the callstacks.
+                diagnostics_set_aborted_via_gui_flag();
                 DebugBreak();
-#else
-#ifdef __APPLE__
+#elif defined(__APPLE__)
                 PrintBacktrace();
 #endif
-				boinc_exit(0);
-#endif
+				boinc_exit(ERR_ABORTED_VIA_GUI);
             }
         }
         if (match_tag(buf, "<reread_app_info/>")) {
diff --git a/checkin_notes b/checkin_notes
index 73277607ea..6b77f9fa4f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3158,3 +3158,14 @@ Charlie  23 Mar 2006
         boinc_api.C
     lib/
         mac_backtrace.C
+
+Rom    23 Mar 2006
+    - Fix the boinc_exit(0) call when an abort happens to 
+        boinc_exit(ERR_ABORTED_VIA_GUI).
+    - Remove a duplicated class identifier so that the manager will
+        with g++ 4.1
+        
+    api/
+        boinc_api.C
+    clientgui/
+        BOINCTaskBar.h
diff --git a/clientgui/BOINCTaskBar.h b/clientgui/BOINCTaskBar.h
index 97c815fbd6..af747e7a53 100644
--- a/clientgui/BOINCTaskBar.h
+++ b/clientgui/BOINCTaskBar.h
@@ -76,7 +76,7 @@ public:
 #endif
 
 #ifndef __WXMSW__
-    inline bool CTaskBarIcon::IsBalloonsSupported() {
+    inline bool IsBalloonsSupported() {
         return false;
     }
 #endif