summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-21 17:17:36 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2013-01-21 17:17:36 +0100
commit301c69e2c0dbcfd08177eccdd9adc5a9f29f25c1 (patch)
tree355ad662130462d24925769f47551c4317979f83 /tools
parent3afab4c1bb302c3c4e1d0d6579a823565e1909bf (diff)
downloadmsitools-301c69e2c0dbcfd08177eccdd9adc5a9f29f25c1.tar.gz
msitools-301c69e2c0dbcfd08177eccdd9adc5a9f29f25c1.tar.xz
msitools-301c69e2c0dbcfd08177eccdd9adc5a9f29f25c1.zip
build-sys: g_type_init() is deprecated since 2.36
Diffstat (limited to 'tools')
-rw-r--r--tools/msibuild.c5
-rw-r--r--tools/msiinfo.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/msibuild.c b/tools/msibuild.c
index e4a7b1f..5f638c5 100644
--- a/tools/msibuild.c
+++ b/tools/msibuild.c
@@ -260,7 +260,10 @@ int main(int argc, char *argv[])
gboolean success = FALSE;
int n;
- g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,1)
+ g_type_init ();
+#endif
+
if (argc <= 2 )
{
show_usage();
diff --git a/tools/msiinfo.c b/tools/msiinfo.c
index b68172b..36dd0cd 100644
--- a/tools/msiinfo.c
+++ b/tools/msiinfo.c
@@ -776,7 +776,10 @@ int main(int argc, char **argv)
GError *error = NULL;
struct Command *cmd = NULL;
- g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,1)
+ g_type_init ();
+#endif
+
program_name = get_basename(argv[0]);
if (argc == 1) {