jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnotify/notify.c
View File

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

2
tests/test-error.c
View File

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

2
tests/test-replace.c
View File

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

2
tools/notify-send.c
View File

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