zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of move usage of deprecated g_type_init API (patchset #1 id:1 of https://codereview.webrtc.org/2666103002/ )

Browse Source 
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: b2caab7f60
>
> 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: d1685ab547

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}
This commit is contained in:
oprypin
2017-01-31 06:50:14 -08:00
committed by Commit bot
parent d1685ab547
commit 6fb4f5696d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/examples/peerconnection/client/linux/main.cc
View File

@ -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)