Conditionall call g_type_init() after a version check

There's no need to call g_type_init() since GLib 2.36, so let's hide it
when building against newer versions of GLib.
This commit is contained in:
Emmanuele Bassi 2017-07-17 10:16:06 +01:00
parent 46e8b1cfad
commit 43aac613f1
4 changed files with 8 additions and 0 deletions

View File

@ -153,7 +153,9 @@ notify_init (const char *app_name)
notify_set_app_name (app_name);
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
_initted = TRUE;

View File

@ -29,7 +29,9 @@ main ()
{
NotifyNotification *n;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
notify_init ("Error Handling");

View File

@ -28,7 +28,9 @@ main ()
GError *error;
error = NULL;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
notify_init ("Replace Test");

View File

@ -173,7 +173,9 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init ();
#endif
g_set_prgname (argv[0]);
g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);