From 6fb4f5696d9c07df3b04595db311ca5ca6e093ea Mon Sep 17 00:00:00 2001 From: oprypin Date: Tue, 31 Jan 2017 06:50:14 -0800 Subject: [PATCH] Reland of move usage of deprecated g_type_init API (patchset #1 id:1 of https://codereview.webrtc.org/2666103002/ ) Reason for revert: Relanding because breakage was not related to this change. Original issue's description: > Revert of Remove usage of deprecated g_type_init API (patchset #1 id:1 of https://codereview.webrtc.org/2660823003/ ) > > Reason for revert: > Reverting due to internal breakage. Will investigate and re-land > > Original issue's description: > > Remove usage of deprecated g_type_init API > > > > BUG=webrtc:7024 > > > > Review-Url: https://codereview.webrtc.org/2660823003 > > Cr-Commit-Position: refs/heads/master@{#16376} > > Committed: https://chromium.googlesource.com/external/webrtc/+/b2caab7f6078ed46d4bda5103d7f8c93b896a518 > > TBR=kjellander@webrtc.org,perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7024 > > Review-Url: https://codereview.webrtc.org/2666103002 > Cr-Commit-Position: refs/heads/master@{#16379} > Committed: https://chromium.googlesource.com/external/webrtc/+/d1685ab547dcd4b362e44e99894123d2b171451c TBR=kjellander@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7024 Review-Url: https://codereview.webrtc.org/2666923002 Cr-Commit-Position: refs/heads/master@{#16380} --- webrtc/examples/peerconnection/client/linux/main.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/webrtc/examples/peerconnection/client/linux/main.cc index 4db929c82e..2982c287f1 100644 --- a/webrtc/examples/peerconnection/client/linux/main.cc +++ b/webrtc/examples/peerconnection/client/linux/main.cc @@ -54,7 +54,11 @@ class CustomSocketServer : public rtc::PhysicalSocketServer { int main(int argc, char* argv[]) { gtk_init(&argc, &argv); - g_type_init(); + // g_type_init API is deprecated (and does nothing) since glib 2.35.0, see: + // https://mail.gnome.org/archives/commits-list/2012-November/msg07809.html +#if !GLIB_CHECK_VERSION(2, 35, 0) + g_type_init(); +#endif // g_thread_init API is deprecated since glib 2.31.0, see release note: // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html #if !GLIB_CHECK_VERSION(2, 31, 0)