Merge lp:~ricotz/bamf/g-type-init into lp:bamf/0.4

Proposed by Rico Tzschichholz on 2012-10-27
Status: Merged
Approved by: Didier Roche on 2012-11-12
Approved revision: 494
Merged at revision: 497
Proposed branch: lp:~ricotz/bamf/g-type-init
Merge into: lp:bamf/0.4
Diff against target: 13 lines (+2/-0)
1 file modified
tests/libbamf/test-libbamf.c (+2/-0)
To merge this branch: bzr merge lp:~ricotz/bamf/g-type-init
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-11-05
Marco Trevisan (Treviño) 2012-10-27 Approve on 2012-11-05
Review via email: mp+131722@code.launchpad.net

Commit Message

tests: Don't call g_type_init while building against glib >= 2.35

Description of the Change

Since glib 2.35.0 calling g_type_init is deprecated

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/libbamf/test-libbamf.c'
2--- tests/libbamf/test-libbamf.c 2010-05-05 14:17:07 +0000
3+++ tests/libbamf/test-libbamf.c 2012-10-27 07:37:20 +0000
4@@ -30,7 +30,9 @@
5 gint
6 main (gint argc, gchar *argv[])
7 {
8+#if !GLIB_CHECK_VERSION(2, 35, 0)
9 g_type_init ();
10+#endif
11 g_test_init (&argc, &argv, NULL);
12
13 gtk_init (&argc, &argv);

Subscribers

People subscribed via source and target branches