*** empty log message ***

svn path=/trunk/boinc/; revision=9715

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/>")) {

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

clientgui/BOINCTaskBar.h

@@ -76,7 +76,7 @@ public:
 #endif
 
 #ifndef __WXMSW__
-    inline bool CTaskBarIcon::IsBalloonsSupported() {
+    inline bool IsBalloonsSupported() {
         return false;
     }
 #endif