Merge lp:~laney/activity-log-manager/toolbar-iconsize into lp:activity-log-manager

Proposed by Iain Lane
Status: Merged
Merge reported by: Robert Ancell
Merged at revision: not available
Proposed branch: lp:~laney/activity-log-manager/toolbar-iconsize
Merge into: lp:activity-log-manager
Diff against target: 11 lines (+1/-1)
1 file modified
src/unified-privacy.vala (+1/-1)
To merge this branch: bzr merge lp:~laney/activity-log-manager/toolbar-iconsize
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Activity Log Manager Pending
Review via email: mp+235132@code.launchpad.net

Description of the change

This now fails to build due to a type error.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:86
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/activity-log-manager/toolbar-iconsize/+merge/235132/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/activity-log-manager-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/activity-log-manager-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/activity-log-manager-ci/11/rebuild

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 'src/unified-privacy.vala'
2--- src/unified-privacy.vala 2014-02-06 16:12:21 +0000
3+++ src/unified-privacy.vala 2014-09-18 14:11:08 +0000
4@@ -289,7 +289,7 @@
5 // Add/Remove buttons
6 var exception_toolbar = new Toolbar();
7 exception_toolbar.toolbar_style = ToolbarStyle.ICONS;
8- exception_toolbar.icon_size = 1;
9+ exception_toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR;
10 exception_toolbar.icon_size_set = true;
11 exception_toolbar.visible = true;
12

Subscribers

People subscribed via source and target branches