Changeset 64752 in webkit
- Timestamp:
- Aug 5, 2010 8:29:13 AM (14 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r64629 r64752 1 2010-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 1 14 2010-08-03 Daniel Bates <dbates@rim.com> 2 15 -
trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
r64567 r64752 24 24 #include "webkitwebinspector.h" 25 25 #include "webkitprivate.h" 26 #include "webkitversion.h" 26 27 #include "InspectorController.h" 27 28 #include "NotImplemented.h" … … 85 86 GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get())); 86 87 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 } 89 92 90 93 webkit_web_view_load_uri(inspectorWebView, inspectorURI.get()); -
trunk/WebKit/gtk/webkit/webkitversion.h.in
r49168 r64752 31 31 #define WEBKIT_USER_AGENT_MAJOR_VERSION (@WEBKIT_USER_AGENT_MAJOR_VERSION@) 32 32 #define WEBKIT_USER_AGENT_MINOR_VERSION (@WEBKIT_USER_AGENT_MINOR_VERSION@) 33 #define WEBKITGTK_API_VERSION (@WEBKITGTK_API_VERSION@) 33 34 34 35 #define WEBKIT_CHECK_VERSION(major, minor, micro) \
Note: See TracChangeset
for help on using the changeset viewer.