Changeset 416

Timestamp:

07/24/08 19:31:53 (4 months ago)

Author:

jcverdie

Message:

BAL:

2008-07-24 Jean-Charles Verdié <jcverdie@pleyo.com>

Reviewed by Mario Bensi.
Incorrect DEFINE of MACPORT

• Base/wtf/Platform.h:
  

WebKit:

2008-07-24 Jean-Charles Verdié <jcverdie@pleyo.com>

Reviewed by Mario Bensi.
Adapt sysinfo code for MacOS with sysctl,
Change incorrect not-ifdef'd includes
Change improper direct reference to OWBAL_PLATFORM_MACPORT in very old code

• OrigynWebBrowser/Api/WebView.cpp:
  (WebView::setCacheModel):
  (WebView::userAgentForKURL):
  

Files:

• trunk/BAL/Base/wtf/Platform.h (modified) (1 diff)
• trunk/BAL/ChangeLogOWB (modified) (1 diff)
• trunk/BAL/scripts/patches/Platform.patch (modified) (1 diff)
• trunk/WebKit/ChangeLogOWB (modified) (1 diff)
• trunk/WebKit/OrigynWebBrowser/Api/WebView.cpp (modified) (3 diffs)

trunk/BAL/Base/wtf/Platform.h

@@ -56 +56 @@
-#if defined(__OWBAL_PLATFORM_MACPORT__)
-#undef WTF_PLATFORM_MAC
-
+ 1
-#endif
-

trunk/BAL/ChangeLogOWB

@@ +1 @@
+2008-07-24  Jean-Charles Verdié  <jcverdie@pleyo.com>
+
+        Reviewed by Mario Bensi.
+        Incorrect DEFINE of MACPORT
+
+        * Base/wtf/Platform.h:
+
-2008-07-24  Olivier DOLE  <odole@pleyo.com>
-

trunk/BAL/scripts/patches/Platform.patch

@@ -26 +26 @@
-+#if defined(__OWBAL_PLATFORM_MACPORT__)
-+#undef WTF_PLATFORM_MAC
-
+ 1
-+#endif
-+

trunk/WebKit/ChangeLogOWB

@@ +1 @@
+2008-07-24  Jean-Charles Verdié  <jcverdie@pleyo.com>
+
+        Reviewed by Mario Bensi.
+        Adapt sysinfo code for MacOS with sysctl, 
+        Change incorrect not-ifdef'd includes
+        Change improper direct reference to __OWBAL_PLATFORM_MACPORT__ in very old code
+
+        * OrigynWebBrowser/Api/WebView.cpp:
+        (WebView::setCacheModel):
+        (WebView::userAgentForKURL):
+
-2008-07-24  Olivier DOLE  <odole@pleyo.com>
-

trunk/WebKit/OrigynWebBrowser/Api/WebView.cpp

@@ -105 +105 @@
-#include DEEPSEE_INCLUDE
-
+#if PLATFORM(MACPORT)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#elif PLATFORM(AMIGAOS4)
+#include <intuition/intuition.h>
+#else
-#include <sys/sysinfo.h>
-
-#if PLATFORM(AMIGAOS4)
-#include <intuition/intuition.h>
-#endif
-
@@ -307 +310 @@
-    unsigned long long diskFreeSize = 4096;
-    
-
+
+
+
+
+
+
+
+
+
-    struct sysinfo info;
-    memset(&info, 0, sizeof(info));
@@ -872 +883 @@
-
-    if (!m_userAgentStandard.length())
-def __OWBAL_PLATFORM_MACPORT__
+ PLATFORM(MACPORT)
-        //We use the user agent from safari to avoid the rejection from google services (google docs, gmail, etc...)
-        m_userAgentStandard =  "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; fr) AppleWebKit/522.11 (KHTML, like Gecko) Safari/412 OWB/Doduo";