Merge lp://staging/~dbarth/dbus-test-runner/glib-compat into lp://staging/dbus-test-runner/13.04
Proposed by
David Barth
Status: | Merged |
---|---|
Approved by: | Mathieu Trudel-Lapierre |
Approved revision: | 59 |
Merged at revision: | 59 |
Proposed branch: | lp://staging/~dbarth/dbus-test-runner/glib-compat |
Merge into: | lp://staging/dbus-test-runner/13.04 |
Diff against target: |
108 lines (+51/-2) 5 files modified
libdbustest/bustle.c (+1/-0) libdbustest/glib-compat.h (+43/-0) libdbustest/process.c (+2/-0) libdbustest/service.c (+3/-0) src/dbus-test-runner.c (+2/-2) |
To merge this branch: | bzr merge lp://staging/~dbarth/dbus-test-runner/glib-compat |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
This ensures that dbus-test-runner still builds on 12.04, by wrapping the use of the new g_clear_pointer with a macro on older glibs.
Description of the change
This ensures that dbus-test-runner still builds on 12.04, by wrapping the use of the new g_clear_pointer with a macro on older glibs.
To post a comment you must log in.
FAILED: Continuous integration, rev:52 jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/17/ jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/./build= pbuilder, distribution= quantal, flavor= amd64/17/ console jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/./build= pbuilder, distribution= quantal, flavor= i386/17/ console jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/./build= pbuilder, distribution= raring, flavor= amd64/17/ console jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/./build= pbuilder, distribution= raring, flavor= i386/17/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/17// rebuild/?
http://