3392e41b22
- Merge fixes from lp:timezonemap - Add cc-timezone-location.h to timezonemapincludes_HEADERS so it gets installed (iain.lane) - Set en_name correctly (iain.lane) - Don't call g_type_init() on glib >= 2.35; it's deprecated (iain.lane)
28 lines
661 B
Diff
28 lines
661 B
Diff
From d57780d32f9ec7d7d091a07c173a88928c17bd09 Mon Sep 17 00:00:00 2001
|
|
From: Iain Lane <iain.lane@canonical.com>
|
|
Date: Fri, 29 Nov 2013 12:26:52 +0000
|
|
Subject: [PATCH 18/18] Don't call g_type_init() on glib >= 2.35; it's
|
|
deprecated
|
|
|
|
---
|
|
src/test-timezone.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/test-timezone.c b/src/test-timezone.c
|
|
index a2271c4..5658227 100644
|
|
--- a/src/test-timezone.c
|
|
+++ b/src/test-timezone.c
|
|
@@ -23,7 +23,9 @@ int main (int argc, char **argv)
|
|
return 1;
|
|
}
|
|
|
|
+#if !GLIB_CHECK_VERSION(2, 35, 0)
|
|
g_type_init();
|
|
+#endif
|
|
GValue zone = {0};
|
|
g_value_init(&zone, G_TYPE_STRING);
|
|
|
|
--
|
|
1.8.4.2
|
|
|