2010-10-15 Sergio Villar Senin <svillar@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Fix introspection support
        https://bugs.webkit.org/show_bug.cgi?id=47723

        Added HTTP cache directory to the WebkitGtk+ GIR sources.

        * GNUmakefile.am:
2010-10-15  Sergio Villar Senin  <svillar@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Fix introspection support
        https://bugs.webkit.org/show_bug.cgi?id=47723

        WebKitSoupCacheType was incorrectly registered twice. Renamed to
        WebKitSoupCacheTypeType for the enumerated type.

        * platform/network/soup/cache/webkit/soup-cache.c:
        (webkit_soup_cache_type_get_type):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@69858 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index eac1feb..3c21561 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-15  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix introspection support
+        https://bugs.webkit.org/show_bug.cgi?id=47723
+
+        Added HTTP cache directory to the WebkitGtk+ GIR sources.
+
+        * GNUmakefile.am:
+
 2010-10-14  Andras Becsi  <abecsi@webkit.org>
 
         Reviewed by Csaba Osztrogonác.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 1c64f5c..6de64a0 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -424,6 +424,7 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITG
             --output=$@ \
             --add-include-path=$(top_srcdir)/WebKit/gtk \
             --add-include-path=$(builddir) \
+            -I$(top_srcdir)/WebCore/platform/network/soup/cache \
             -I$(top_srcdir)/WebKit/gtk \
             -I$(top_builddir)/WebKit/gtk \
             -I$(top_builddir)/DerivedSources \

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2d521f..32ff887 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-15  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Fix introspection support
+        https://bugs.webkit.org/show_bug.cgi?id=47723
+
+        WebKitSoupCacheType was incorrectly registered twice. Renamed to
+        WebKitSoupCacheTypeType for the enumerated type.
+
+        * platform/network/soup/cache/webkit/soup-cache.c:
+        (webkit_soup_cache_type_get_type):
+
 2010-10-15  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Yury Semikhatsky.

diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.c b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
index b25c4cc..4a123ba 100644 (file)
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.c
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
@@ -1179,7 +1179,7 @@ webkit_soup_cache_type_get_type (void)
        };
 
        if (!cache_type) {
-               cache_type = g_enum_register_static ("WebKitSoupCacheType", cache_types);
+               cache_type = g_enum_register_static ("WebKitSoupCacheTypeType", cache_types);
        }
        return cache_type;
 }