summaryrefslogtreecommitdiff
path: root/pluma
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-16 12:37:53 +0100
committerinfirit <[email protected]>2014-12-16 12:37:53 +0100
commit13392e50c61ce3f3d7d04b59677380f935cf3d3c (patch)
tree48caf98179e465c01ebe16a17ea72ace0641b01b /pluma
parentc24498bd9242a6b204d20e4c42cdde714c43068a (diff)
downloadpluma-13392e50c61ce3f3d7d04b59677380f935cf3d3c.tar.bz2
pluma-13392e50c61ce3f3d7d04b59677380f935cf3d3c.tar.xz
Revert "Drop support for glib < 2.36"
This reverts commit 495f56659d607938db00e34c9f84bac24013d999.
Diffstat (limited to 'pluma')
-rw-r--r--pluma/pluma.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/pluma/pluma.c b/pluma/pluma.c
index 9e52bb90..9166a749 100644
--- a/pluma/pluma.c
+++ b/pluma/pluma.c
@@ -555,6 +555,15 @@ main (int argc, char *argv[])
gchar *dir;
gchar *icon_dir;
+ /* Init type system as soon as possible */
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+ g_type_init ();
+#endif
+
+ /* Init glib threads asap */
+#if !GLIB_CHECK_VERSION (2, 32, 0)
+ g_thread_init (NULL);
+#endif
/* Setup debugging */
pluma_debug_init ();