overlay-scrollbar

Merge lp://qastaging/~laney/overlay-scrollbar/drop-gtk3 into lp://qastaging/overlay-scrollbar

drop-gtk3
Merge into trunk

Proposed by Iain Lane on 2015-06-03

Status:	Merged
Merged at revision:	392
Proposed branch:	lp://qastaging/~laney/overlay-scrollbar/drop-gtk3
Merge into:	lp://qastaging/overlay-scrollbar
Diff against target:	1916 lines (+164/-1067) 15 files modified configure.ac (+5/-19) data/81overlay-scrollbar (+4/-4) debian/changelog (+9/-0) debian/control (+5/-20) debian/overlay-scrollbar-gtk2.install (+1/-1) debian/overlay-scrollbar-gtk3.install (+0/-1) debian/overlay-scrollbar.install (+2/-2) debian/rules (+7/-24) os/Makefile.am (+1/-9) os/os-bar.c (+0/-134) os/os-private.h (+0/-4) os/os-scrollbar.c (+130/-787) os/os-thumb.c (+0/-46) tests/Makefile.am (+0/-8) tests/test-os.c (+0/-8)
To merge this branch:	bzr merge lp://qastaging/~laney/overlay-scrollbar/drop-gtk3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-04
Lars Karlitski		2015-06-03	Approve on 2015-06-03
Ayatana Scrollbar Team		2015-06-03	Pending
Review via email: mp+260932@code.qastaging.launchpad.net

Commit message

Drop overlay-scrollbar-gtk3 - gtk 3.16 has a replacement

Description of the change

We are going to use gtk 3.16's overlay scrollbars. Drop overlay-scrollbar-gtk3.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

FAILED: Continuous integration, rev:402
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/overlay-scrollbar/drop-gtk3/+merge/260932/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/overlay-scrollbar-ci/20/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lars Karlitski (larsu) wrote on 2015-06-03:

Coding style is changed in some areas and the wrong branch is removed on line 613 in the diff (all this switching between ifdef and ifndef is confusing).

I have commits for those in lp:~larsu/overlay-scrollbar/drop-gtk3

review: Needs Fixing

lp://qastaging/~laney/overlay-scrollbar/drop-gtk3 updated on 2015-06-03

403. By Iain Lane on 2015-06-03: merge lp:~larsu/overlay-scrollbar/drop-gtk3

Revision history for this message

Iain Lane (laney) wrote on 2015-06-03:

On Wed, Jun 03, 2015 at 01:12:38PM -0000, Lars Uebernickel wrote:
> Review: Needs Fixing
>
> Coding style is changed in some areas and the wrong branch is removed on line 613 in the diff (all this switching between ifdef and ifndef is confusing).
>
> I have commits for those in lp:~larsu/overlay-scrollbar/drop-gtk3

Thanks, merged, please re-review.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-03:

FAILED: Continuous integration, rev:403
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/overlay-scrollbar/drop-gtk3/+merge/260932/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-wily-i386-ci/2