[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
xan at webkit.org
xan at webkit.org
Wed Dec 22 15:19:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4d77f5210f68f974b1fd3e09f14c105b99ea932a
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 04:21:43 2010 +0000
2010-10-31 Xan Lopez <xlopez at igalia.com>
Try to fix the GTK+ build.
Do not use broken/deprecated functions that won't be available
with G_DISABLE_DEPRECATED (used in debug builds).
* plugins/gtk/PluginPackageGtk.cpp:
(WebCore::PluginPackage::fetchInfo):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71008 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d9f7ba..90df85d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-31 Xan Lopez <xlopez at igalia.com>
+
+ Try to fix the GTK+ build.
+
+ Do not use broken/deprecated functions that won't be available
+ with G_DISABLE_DEPRECATED (used in debug builds).
+
+ * plugins/gtk/PluginPackageGtk.cpp:
+ (WebCore::PluginPackage::fetchInfo):
+
2010-10-31 Kenichi Ishibashi <bashi at google.com>
Reviewed by Adam Barth.
diff --git a/WebCore/plugins/gtk/PluginPackageGtk.cpp b/WebCore/plugins/gtk/PluginPackageGtk.cpp
index f14a1ae..a702296 100644
--- a/WebCore/plugins/gtk/PluginPackageGtk.cpp
+++ b/WebCore/plugins/gtk/PluginPackageGtk.cpp
@@ -74,7 +74,8 @@ bool PluginPackage::fetchInfo()
gchar** mimeDescs = g_strsplit(types, ";", -1);
for (int i = 0; mimeDescs[i] && mimeDescs[i][0]; i++) {
- gchar** mimeData = g_strsplit(g_strdown(mimeDescs[i]), ":", 3);
+ GOwnPtr<char> mime(g_utf8_strdown(mimeDescs[i], -1));
+ gchar** mimeData = g_strsplit(mime.get(), ":", 3);
if (g_strv_length(mimeData) < 3) {
g_strfreev(mimeData);
continue;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list