From 440a86d3f2995b5a61752c8014c36e750db94db0 Mon Sep 17 00:00:00 2001
From: Euan Thoms <euan@potensol.com>
Date: Wed, 4 Nov 2015 06:02:45 +0800
Subject: [PATCH] Stage 8 of clang compiler warning patches.

---
 SoObjects/SOGo/WORequest+SOGo.m | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m
index f528343dd..a0019330a 100644
--- a/SoObjects/SOGo/WORequest+SOGo.m
+++ b/SoObjects/SOGo/WORequest+SOGo.m
@@ -180,14 +180,24 @@
   cc = [self clientCapabilities];
 
   b = (
-       [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
-       && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
-       || (
-           [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
-            || [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
-           )
-       && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
-       );
+        (
+          (
+            [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
+            && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound
+          )
+          ||
+          (
+            [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
+            &&
+            (
+              [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound
+              ||
+              [[cc userAgent] rangeOfString: @"Mac_OS_X"].location != NSNotFound
+            )
+          )
+        )
+        && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound
+      );
 
   return b;
 }