[msitools] build-sys: g_type_init() is deprecated since 2.36
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools] build-sys: g_type_init() is deprecated since 2.36
- Date: Mon, 21 Jan 2013 16:18:33 +0000 (UTC)
commit 301c69e2c0dbcfd08177eccdd9adc5a9f29f25c1
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date: Mon Jan 21 17:17:36 2013 +0100
build-sys: g_type_init() is deprecated since 2.36
tests/testdatabase.c | 4 +++-
tests/testrecord.c | 2 ++
tests/testsuminfo.c | 5 ++++-
tools/msibuild.c | 5 ++++-
tools/msiinfo.c | 5 ++++-
5 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/tests/testdatabase.c b/tests/testdatabase.c
index 9912246..fd27534 100644
--- a/tests/testdatabase.c
+++ b/tests/testdatabase.c
@@ -7468,7 +7468,9 @@ static void test_select_column_names(void)
void main()
{
- g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,1)
+ g_type_init ();
+#endif
test_msidatabase();
test_msiinsert();
diff --git a/tests/testrecord.c b/tests/testrecord.c
index 1542204..39cc275 100644
--- a/tests/testrecord.c
+++ b/tests/testrecord.c
@@ -435,7 +435,9 @@ static void test_fieldzero (void)
void main ()
{
+#if !GLIB_CHECK_VERSION(2,35,1)
g_type_init ();
+#endif
test_msirecord ();
test_MsiRecordGetString ();
diff --git a/tests/testsuminfo.c b/tests/testsuminfo.c
index 80190d5..866ecb1 100644
--- a/tests/testsuminfo.c
+++ b/tests/testsuminfo.c
@@ -373,7 +373,10 @@ static void test_summary_binary(void)
void main()
{
- g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,1)
+ g_type_init ();
+#endif
+
test_suminfo();
test_summary_binary();
}
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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]