Changeset 64752 in webkit


Ignore:
Timestamp:
Aug 5, 2010 8:29:13 AM (14 years ago)
Author:
xan@webkit.org
Message:

2010-08-05 Xan Lopez <xlopez@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):
Location:
trunk/WebKit/gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/gtk/ChangeLog

    r64629 r64752  
     12010-08-05  Xan Lopez  <xlopez@igalia.com>
     2
     3        Reviewed by Gustavo Noronha.
     4
     5        [GTK] Use correct path for Inspector data files in GTK+3.x builds
     6        https://bugs.webkit.org/show_bug.cgi?id=43445
     7
     8        Use the right data path for inspector files when building with
     9        GTK+ 3.x.
     10
     11        * WebCoreSupport/InspectorClientGtk.cpp:
     12        (WebKit::InspectorClient::openInspectorFrontend):
     13
    1142010-08-03  Daniel Bates  <dbates@rim.com>
    215
  • trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

    r64567 r64752  
    2424#include "webkitwebinspector.h"
    2525#include "webkitprivate.h"
     26#include "webkitversion.h"
    2627#include "InspectorController.h"
    2728#include "NotImplemented.h"
     
    8586        GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
    8687        inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
    87     } else
    88         inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/inspector.html", NULL, NULL));
     88    } else {
     89        GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkit-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
     90        inspectorURI.set(g_filename_to_uri(dataPath.get(), NULL, NULL));
     91    }
    8992
    9093    webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
  • trunk/WebKit/gtk/webkit/webkitversion.h.in

    r49168 r64752  
    3131#define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@)
    3232#define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@)
     33#define WEBKITGTK_API_VERSION (@WEBKITGTK_API_VERSION@)
    3334
    3435#define WEBKIT_CHECK_VERSION(major, minor, micro) \
Note: See TracChangeset for help on using the changeset viewer.