Index: WebCore/ChangeLog
===================================================================
--- WebCore/ChangeLog	(revision 28389)
+++ WebCore/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2007-12-04  Michael Natterer  <mitch@imendio.com>
+
+        * WebCore.pro: fix build of webkit-marshal by building the
+        functions into a separate .cpp file instead of including them in
+        the header. This way we can use the marshallers from more than one
+        file without using bad hacks.
+
 2007-12-04  Pierre-Luc Beaudoin  <pierre-luc.beaudoin@collabora.co.uk>
 
         Reviewed by Alp Toker.
Index: WebCore/WebCore.pro
===================================================================
--- WebCore/WebCore.pro	(revision 28389)
+++ WebCore/WebCore.pro	(working copy)
@@ -21,6 +21,7 @@ GENERATED_SOURCES_DIR_SLASH = $$GENERATE
 win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
 
 INCLUDEPATH += $$GENERATED_SOURCES_DIR
+DEPENDPATH += $$GENERATED_SOURCES_DIR
 
 !CONFIG(QTDIR_build) {
      OBJECTS_DIR = tmp
@@ -1744,12 +1745,12 @@ gtk-port {
     #
     # integrate glib-genmarshal as additional compiler
     #
-    QMAKE_GENMARSHAL_CC  = glib-genmarshal
-    glib-genmarshal.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header --body >${QMAKE_FILE_OUT}
-    glib-genmarshal.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
+    QMAKE_GENMARSHAL_CC = glib-genmarshal
+    glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
+    glib-genmarshal.commands = echo 'extern \\"C\\" {' > ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --body >> ${QMAKE_FILE_OUT} && echo '}' >> ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
     glib-genmarshal.input = GENMARSHALS
-    glib-genmarshal.CONFIG = no_link
-    glib-genmarshal.variable_out = PRE_TARGETDEPS
+    glib-genmarshal.variable_out = GENERATED_SOURCES
+    glib-genmarshal.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
     glib-genmarshal.name = GENMARSHALS
     QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal
 }
Index: WebKit/gtk/ChangeLog
===================================================================
--- WebKit/gtk/ChangeLog	(revision 28389)
+++ WebKit/gtk/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2007-12-04  Michael Natterer  <mitch@imendio.com>
+
+        * WebView/webkitwebframe.cpp: don't redeclare the marshaller
+        prototype but simply include "webkit-marshal.h" now that its build
+        is fixed.
+
 2007-12-04  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.
Index: WebKit/gtk/WebView/webkitwebframe.cpp
===================================================================
--- WebKit/gtk/WebView/webkitwebframe.cpp	(revision 28389)
+++ WebKit/gtk/WebView/webkitwebframe.cpp	(working copy)
@@ -28,8 +28,10 @@
  */
 
 #include "config.h"
+
 #include "webkitwebframe.h"
 #include "webkitwebview.h"
+#include "webkit-marshal.h"
 #include "webkitprivate.h"
 
 #include "CString.h"
@@ -49,13 +51,6 @@ using namespace WebCore;
 
 extern "C" {
 
-extern void webkit_marshal_VOID__STRING_STRING (GClosure*     closure,
-                                                GValue*       return_value,
-                                                guint         n_param_values,
-                                                const GValue* param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-
 enum {
     CLEARED,
     LOAD_DONE,