# HG changeset patch
# User t_mrc-ct@sourceforge.jp
# Date 1350811043 -32400
# Branch GECKO1708_2013080114_RELBRANCH
# Node ID 39ba5b68d709754ae48e9aa69c6d0afc550c0350
# Parent  1a48da0151e50796824f004379fc62edca4c85e6
debug build error

diff --git a/mailnews/base/src/nsMessengerOSXIntegration.mm b/mailnews/base/src/nsMessengerOSXIntegration.mm
--- a/mailnews/base/src/nsMessengerOSXIntegration.mm
+++ b/mailnews/base/src/nsMessengerOSXIntegration.mm
@@ -558,16 +558,15 @@
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  if (mOnLeopardOrLater)
-  {
-    id tile = [[NSApplication sharedApplication] dockTile];
-    [tile setBadgeLabel: nil];
-  }
-  else // 10.4
+  if (!mOnLeopardOrLater) // 10.4
   {
     RestoreApplicationDockTileImage();
+    return NS_OK;
   }
 
+  id tile = [[NSApplication sharedApplication] dockTile];
+  [tile setBadgeLabel: nil];
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -620,17 +619,17 @@
     return NS_OK;
   }
 
-  // On 10.5 or later, we can use the new API for this.
-  if (mOnLeopardOrLater)
-  {
-    id tile = [[NSApplication sharedApplication] dockTile];
-    [tile setBadgeLabel:[NSString stringWithFormat:@"%S", total.get()]];
-    return NS_OK;
-  }
-  else
+  // On 10.4 or 10.5, we use the old API for this.
+  if (!mOnLeopardOrLater)
   {
     return BadgeDockIconForTiger(badgeString);
   }
+
+  id tile = [[NSApplication sharedApplication] dockTile];
+  [tile setBadgeLabel:[NSString stringWithFormat:@"%S", total.get()]];
+  return NS_OK;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
 nsresult
@@ -753,8 +752,6 @@
   ::CGContextFlush(context);
   ::EndCGContextForApplicationDockTile(context);
   return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
 NS_IMETHODIMP
