diff options
| author | dcheng <dcheng@chromium.org> | 2014-11-08 00:42:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-08 08:42:37 +0000 |
| commit | 6365b8b86430e17427d030e10660b236465bd6be (patch) | |
| tree | 013e1bac73b83e0f5aff79325aef74bd870ef3b4 | |
| parent | 3e35a2972325aae296a2d64e76f89926ca692375 (diff) | |
| download | chromium_src-6365b8b86430e17427d030e10660b236465bd6be.zip chromium_src-6365b8b86430e17427d030e10660b236465bd6be.tar.gz chromium_src-6365b8b86430e17427d030e10660b236465bd6be.tar.bz2 | |
Fix Trusty me2me native messaging host build after r303309
This is deprecated (and unnecessary) in glib 2.35 and newer, so don't
call it when building against newer glibs.
BUG=431386
TBR=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/712773002
Cr-Commit-Position: refs/heads/master@{#303381}
| -rw-r--r-- | remoting/host/setup/me2me_native_messaging_host_main.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc index ad1f2cb..c39000e 100644 --- a/remoting/host/setup/me2me_native_messaging_host_main.cc +++ b/remoting/host/setup/me2me_native_messaging_host_main.cc @@ -75,9 +75,12 @@ int StartMe2MeNativeMessagingHost() { #endif // defined(OS_MACOSX) #if defined(OS_LINUX) - // g_type_init() is needed prior to GTK 2.36, which includes Ubuntu 12.04 - // (Precise Pangolin) systems. +// g_type_init will be deprecated in 2.36. 2.35 is the development +// version for 2.36, hence do not call g_type_init starting 2.35. +// http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init +#if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); +#endif #endif // defined(OS_LINUX) // Required to find the ICU data file, used by some file_util routines. |