Merge lp://qastaging/~3v1n0/bamf/libbamf-net-dbus-hints into lp://qastaging/bamf/0.4

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 463
Merged at revision: 428
Proposed branch: lp://qastaging/~3v1n0/bamf/libbamf-net-dbus-hints
Merge into: lp://qastaging/bamf/0.4
Prerequisite: lp://qastaging/~3v1n0/bamf/bamfdaemon-net-dbus-hints
Diff against target: 808 lines (+487/-54)
11 files modified
lib/libbamf/Makefile.am (+3/-2)
lib/libbamf/bamf-application.c (+1/-0)
lib/libbamf/bamf-marshal.list (+1/-0)
lib/libbamf/bamf-matcher.c (+97/-30)
lib/libbamf/bamf-matcher.h (+13/-0)
lib/libbamf/bamf-view.c (+34/-3)
lib/libbamf/bamf-window.c (+298/-5)
lib/libbamf/bamf-window.h (+32/-11)
src/Makefile.am (+1/-0)
tests/functional/Makefile.am (+6/-3)
tests/libbamf/Makefile.am (+1/-0)
To merge this branch: bzr merge lp://qastaging/~3v1n0/bamf/libbamf-net-dbus-hints
Reviewer Review Type Date Requested Status
Jason Smith (community) Needs Fixing
Review via email: mp+88096@code.qastaging.launchpad.net

Description of the change

Added the wrapper functions for the new DBus APIs defined in lp:~3v1n0/bamf/bamfdaemon-net-dbus-hints

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Top notch work, approved

review: Approve
Revision history for this message
Jason Smith (jassmith) wrote :

Changing to needs fixing. There is a variable in the bamf_window header named "new". This screws with C++

review: Needs Fixing
Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~3v1n0/bamf/bamfdaemon-net-dbus-hints has not yet been merged into lp:bamf.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/33/console reported an error when processing this lp:~3v1n0/bamf/libbamf-net-dbus-hints branch.
Not merging it.

462. By Marco Trevisan (Treviño)

Merging with upstream.

463. By Marco Trevisan (Treviño)

Fixed build issues, thanks to branch lp:~unity-team/bamf/bamf.merge-resolve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches