Changeset 27050 in webkit

Timestamp:

Oct 25, 2007 11:21:17 AM (16 years ago)

Author:

alp

Message:

2007-10-25 Alp Toker <​alp@atoker.com>

Reviewed by Brady.

​http://bugs.webkit.org/show_bug.cgi?id=15686
GtkLauncher aborts on launch due to uninitialized threading subsystem

Re-enable database support in the GTK+ port, with a fix.

Initialize GLib threading as early as possible.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebKit/gtk/Api/webkitgtkglobal.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-25  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Brady.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15686
+        GtkLauncher aborts on launch due to uninitialized threading subsystem
+
+        Re-enable database support in the GTK+ port, with a fix.
+
+        * WebCore.pro:
+
 2007-10-25  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -52 +52 @@
 
 gtk-port: PKGCONFIG += gthread-2.0
-
-# Database support temporarily disabled, see http://bugs.webkit.org/show_bug.cgi?id=15686
-gtk-port: DEFINES += ENABLE_ICONDATABASE=0 ENABLE_DATABASE=0
 
 # Optional components (look for defs in config.h and included files!)
@@ -961 +958 @@
 }
 
-# ENABLE_DATABASE probably cannot be disabled without breaking things
 contains(DEFINES, ENABLE_DATABASE=1) {
     FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATABASE=1

trunk/WebKit/gtk/Api/webkitgtkglobal.cpp

@@ -40 +40 @@
     WebCore::InitializeLoggingChannelsIfNecessary();
 
+    WebCore::initializeThreading();
+
 #if ENABLE(DATABASE)
     // FIXME: It should be possible for client applications to override this default location

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2007-10-25  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Brady.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15686
+        GtkLauncher aborts on launch due to uninitialized threading subsystem
+
+        Re-enable database support in the GTK+ port, with a fix.
+
+        Initialize GLib threading as early as possible.
+
+        * Api/webkitgtkglobal.cpp:
+
 2007-10-25  Alp Toker  <alp@atoker.com>