43445 2010-08-03 14:22:31 -0700 [GTK] Use correct path for Inspector data files in GTK+3.x builds 2010-08-05 08:37:23 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned mrobinson oldest_to_newest 259685 0 xan.lopez 2010-08-03 14:22:31 -0700 SSIA. 259689 1 63376 xan.lopez 2010-08-03 14:24:34 -0700 Created attachment 63376 datainspector.diff 259715 2 mrobinson 2010-08-03 15:02:59 -0700 This patch seems sane to me. Perhaps adding a WEBKITGTK_API_VERSION define and setting it to @WEBKITGTK_API_VERSION@ would make this bit of code future proof though. Then the path could just be: inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkit-"WEBKITGTK_API_VERSION"/webinspector/inspector.html" 259732 3 63376 xan.lopez 2010-08-03 15:27:37 -0700 Comment on attachment 63376 datainspector.diff Martin is right, we should do as he says. I'll upload a patch doing that tomorrow. 260628 4 xan.lopez 2010-08-05 08:37:23 -0700 The patch suggested by Martin was committed as r64752, closing. 63376 2010-08-03 14:24:34 -0700 2010-08-03 15:27:37 -0700 datainspector.diff datainspector.diff text/plain 2362 xan.lopez RnJvbSA1MTgxMGZiY2M0ZTNkYTlhMTdlNjI4OTdjNmU3YzcwNGI1MTZhYWM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBU dWUsIDMgQXVnIDIwMTAgMjI6MDk6MjEgKzAyMDAKU3ViamVjdDogW1BBVENIXSAyMDEwLTA4LTAz ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCgogICAgICAgIFtHVEtdIFVzZSBjb3JyZWN0IHBhdGggZm9yIEluc3BlY3Rv ciBkYXRhIGZpbGVzIGluIEdUSyszLnggYnVpbGRzCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNDQ1CgogICAgICAgIFVzZSB0aGUgcmlnaHQgZGF0YSBw YXRoIGZvciBpbnNwZWN0b3IgZmlsZXMgd2hlbiBidWlsZGluZyB3aXRoCiAgICAgICAgR1RLKyAz LnguCgogICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3RrLmNwcDoKICAg ICAgICAoV2ViS2l0OjpJbnNwZWN0b3JDbGllbnQ6Om9wZW5JbnNwZWN0b3JGcm9udGVuZCk6Ci0t LQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx MyArKysrKysrKysrKysrCiBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVu dEd0ay5jcHAgfCAgICA0ICsrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwg MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCmluZGV4IGQ3NWE2ZDUuLjQ5MmIzMjkgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTAtMDgtMDMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFVzZSBjb3JyZWN0 IHBhdGggZm9yIEluc3BlY3RvciBkYXRhIGZpbGVzIGluIEdUSyszLnggYnVpbGRzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ0NQorCisgICAgICAg IFVzZSB0aGUgcmlnaHQgZGF0YSBwYXRoIGZvciBpbnNwZWN0b3IgZmlsZXMgd2hlbiBidWlsZGlu ZyB3aXRoCisgICAgICAgIEdUSysgMy54LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5z cGVjdG9yQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5zcGVjdG9yQ2xpZW50Ojpv cGVuSW5zcGVjdG9yRnJvbnRlbmQpOgorCisyMDEwLTA4LTAzICBYYW4gTG9wZXogIDx4bG9wZXpA aWdhbGlhLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCiAKICAg ICAgICAgW0dUS10gRml4IERPTSBldmVudCBkaXNwYXRjaApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRHdGsuY3BwCmluZGV4IDcwMzlkZDYuLjQxZTQ2YjUg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50R3Rr LmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudEd0ay5j cHAKQEAgLTg1LDcgKzg1LDExIEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50OjpvcGVuSW5zcGVjdG9y RnJvbnRlbmQoSW5zcGVjdG9yQ29udHJvbGxlciogY29udHJvbGxlcikKICAgICAgICAgR093blB0 cjxnY2hhcj4gZnVsbFBhdGgoZ19zdHJkdXBfcHJpbnRmKCIlcy9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwiLCBjdXJyZW50RGlyZWN0b3J5LmdldCgpKSk7CiAgICAg ICAgIGluc3BlY3RvclVSSS5zZXQoZ19maWxlbmFtZV90b191cmkoZnVsbFBhdGguZ2V0KCksIE5V TEwsIE5VTEwpKTsKICAgICB9IGVsc2UKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgICAg ICBpbnNwZWN0b3JVUkkuc2V0KGdfZmlsZW5hbWVfdG9fdXJpKERBVEFfRElSIi93ZWJraXQtMS4w L3dlYmluc3BlY3Rvci9pbnNwZWN0b3IuaHRtbCIsIE5VTEwsIE5VTEwpKTsKKyNlbHNlCisgICAg ICAgIGluc3BlY3RvclVSSS5zZXQoZ19maWxlbmFtZV90b191cmkoREFUQV9ESVIiL3dlYmtpdC0z LjAvd2ViaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sIiwgTlVMTCwgTlVMTCkpOworI2VuZGlmCiAK ICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkoaW5zcGVjdG9yV2ViVmlldywgaW5zcGVjdG9y VVJJLmdldCgpKTsKIAotLSAKMS43LjIKCg==