[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3d1fc55afaf35cc8c86f525c92b7eadec81fe0da
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 15:29:13 2010 +0000

    2010-08-05  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            [GTK] Use correct path for Inspector data files in GTK+3.x builds
            https://bugs.webkit.org/show_bug.cgi?id=43445
    
            Use the right data path for inspector files when building with
            GTK+ 3.x.
    
            * WebCoreSupport/InspectorClientGtk.cpp:
            (WebKit::InspectorClient::openInspectorFrontend):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e1b50e6..087a0a6 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-05  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Use correct path for Inspector data files in GTK+3.x builds
+        https://bugs.webkit.org/show_bug.cgi?id=43445
+
+        Use the right data path for inspector files when building with
+        GTK+ 3.x.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::openInspectorFrontend):
+
 2010-08-03  Daniel Bates  <dbates at rim.com>
 
         Fix misspelled word 'teh' in the description of the XSS Auditor setting.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index 7039dd6..bb7d661 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -23,6 +23,7 @@
 #include "webkitwebview.h"
 #include "webkitwebinspector.h"
 #include "webkitprivate.h"
+#include "webkitversion.h"
 #include "InspectorController.h"
 #include "NotImplemented.h"
 #include "PlatformString.h"
@@ -84,8 +85,10 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller)
         GOwnPtr<gchar> currentDirectory(g_get_current_dir());
         GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
         inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
-    } else
-        inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
+    } else {
+        GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkit-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
+        inspectorURI.set(g_filename_to_uri(dataPath.get(), NULL, NULL));
+    }
 
     webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
 
diff --git a/WebKit/gtk/webkit/webkitversion.h.in b/WebKit/gtk/webkit/webkitversion.h.in
index 5eb9426..ce6b569 100644
--- a/WebKit/gtk/webkit/webkitversion.h.in
+++ b/WebKit/gtk/webkit/webkitversion.h.in
@@ -30,6 +30,7 @@ G_BEGIN_DECLS
 #define WEBKIT_MICRO_VERSION (@WEBKIT_MICRO_VERSION@)
 #define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@)
 #define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@)
+#define WEBKITGTK_API_VERSION (@WEBKITGTK_API_VERSION@)
 
 #define WEBKIT_CHECK_VERSION(major, minor, micro) \
   (WEBKIT_MAJOR_VERSION > (major) || \

-- 
WebKit Debian packaging