[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Mar 17 18:17:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 2e4824fdf6a40ee4e3f8d5257ba3078043c632bb
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 4 19:15:35 2010 +0000
[Gtk] Unreviewed build fix.
Patch by Antonio Gomes <tonikitoo at webkit.org>
'glib_file_name' renamed to 'gligFileName'.
* platform/graphics/gtk/ImageGtk.cpp:
(WebCore::Image::loadPlatformResource):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 753eb85..95dceb1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-04 Antonio Gomes <tonikitoo at webkit.org>
+
+ Unreviewed build fix.
+ Patch by Antonio Gomes <tonikitoo at webkit.org>
+
+ 'glib_file_name' renamed to 'gligFileName'.
+
+ * platform/graphics/gtk/ImageGtk.cpp:
+ (WebCore::Image::loadPlatformResource):
+
2010-03-04 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/graphics/gtk/ImageGtk.cpp b/WebCore/platform/graphics/gtk/ImageGtk.cpp
index a5bf64d..dfc0947 100644
--- a/WebCore/platform/graphics/gtk/ImageGtk.cpp
+++ b/WebCore/platform/graphics/gtk/ImageGtk.cpp
@@ -159,7 +159,7 @@ PassRefPtr<Image> Image::loadPlatformResource(const char* name)
if (fileName.isNull()) {
gchar* imagename = g_strdup_printf("%s.png", name);
gchar* glibFileName = g_build_filename(DATA_DIR, "webkit-1.0", "images", imagename, 0);
- fileName = glib_file_name;
+ fileName = glibFileName;
g_free(imagename);
g_free(glibFileName);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list