Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (137587 => 137588)
--- trunk/Source/WebKit/efl/ChangeLog 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-12-13 14:21:49 UTC (rev 137588)
@@ -1,3 +1,16 @@
+2012-12-13 Jussi Kukkonen <[email protected]>
+
+ [EFL][GTK] Don't call deprecated g_type_init when glib => 2.35
+ https://bugs.webkit.org/show_bug.cgi?id=103209
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ g_type_init() is deprecated from 2.35.0 onwards. Don't call it
+ in that case to avoid warnings and/or build failure.
+
+ * ewk/ewk_main.cpp:
+ (_ewk_init_body):
+
2012-12-13 Gyuyoung Kim <[email protected]>
Regression(r137568): Broke layout test on EFL WK1
Modified: trunk/Source/WebKit/efl/ewk/ewk_main.cpp (137587 => 137588)
--- trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-12-13 14:21:49 UTC (rev 137588)
@@ -159,8 +159,9 @@
Eina_Bool _ewk_init_body(void)
{
-
+#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
+#endif
if (!ecore_main_loop_glib_integrate())
WARN("Ecore was not compiled with GLib support, some plugins will not "
Modified: trunk/Source/WebKit2/ChangeLog (137587 => 137588)
--- trunk/Source/WebKit2/ChangeLog 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-13 14:21:49 UTC (rev 137588)
@@ -1,3 +1,23 @@
+2012-12-13 Jussi Kukkonen <[email protected]>
+
+ [EFL][GTK] Don't call deprecated g_type_init when glib => 2.35
+ https://bugs.webkit.org/show_bug.cgi?id=103209
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ g_type_init() is deprecated from 2.35.0 onwards. Don't call it
+ in that case to avoid warnings and/or build failure.
+
+ Also, remove a call to g_type_init() from WebProcessMainGtk():
+ It is not needed if gtk_init() is called.
+
+ * UIProcess/API/efl/ewk_main.cpp:
+ (ewk_init):
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (WebKit::WebProcessMainEfl):
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+ (WebKit::WebProcessMainGtk):
+
2012-12-13 Joaquim Rocha <[email protected]>
REGRESSION (r137432): The /webkit2/WebKitCookieManager/accept-policy unit test is failing
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp (137587 => 137588)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-12-13 14:21:49 UTC (rev 137588)
@@ -85,7 +85,9 @@
}
#endif
+#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
+#endif
if (!ecore_main_loop_glib_integrate()) {
WARN("Ecore was not compiled with GLib support, some plugins will not "
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (137587 => 137588)
--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2012-12-13 14:21:49 UTC (rev 137588)
@@ -88,7 +88,9 @@
}
#endif
+#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
+#endif
if (!ecore_main_loop_glib_integrate())
return 1;
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (137587 => 137588)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2012-12-13 14:21:49 UTC (rev 137588)
@@ -55,7 +55,6 @@
#endif
gtk_init(&argc, &argv);
- g_type_init();
JSC::initializeThreading();
WTF::initializeMainThread();
Modified: trunk/Tools/ChangeLog (137587 => 137588)
--- trunk/Tools/ChangeLog 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Tools/ChangeLog 2012-12-13 14:21:49 UTC (rev 137588)
@@ -1,3 +1,16 @@
+2012-12-13 Jussi Kukkonen <[email protected]>
+
+ [EFL][GTK] Don't call deprecated g_type_init when glib => 2.35
+ https://bugs.webkit.org/show_bug.cgi?id=103209
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ g_type_init() is deprecated from 2.35.0 onwards. Don't call it
+ in that case to avoid warnings and/or build failure.
+
+ * DumpRenderTree/gtk/ImageDiff.cpp:
+ (main):
+
2012-12-13 Claudio Saavedra <[email protected]>
[Tools] Add exception for gtk_style_context_get()
Modified: trunk/Tools/DumpRenderTree/gtk/ImageDiff.cpp (137587 => 137588)
--- trunk/Tools/DumpRenderTree/gtk/ImageDiff.cpp 2012-12-13 14:02:12 UTC (rev 137587)
+++ trunk/Tools/DumpRenderTree/gtk/ImageDiff.cpp 2012-12-13 14:21:49 UTC (rev 137588)
@@ -178,7 +178,9 @@
int main(int argc, char* argv[])
{
+#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
+#endif
GError* error = 0;
GOptionContext* context = g_option_context_new("- compare two image files, printing their percentage difference and the difference image to stdout");
