libindicator

Merge lp://staging/~larsu/libindicator/ng-add-scrolling into lp://staging/libindicator/13.10

ng-add-scrolling
Merge into trunk.13.10

Proposed by Lars Karlitski on 2013-09-09

Status:

Merged

Approved by:

Charles Kerr on 2013-09-09

Approved revision:

513

Merged at revision:

511

Proposed branch:

lp://staging/~larsu/libindicator/ng-add-scrolling

Merge into:

lp://staging/libindicator/13.10

Diff against target:

115 lines (+58/-6)

1 file modified

libindicator/indicator-ng.c (+58/-6)

To merge this branch:

bzr merge lp://staging/~larsu/libindicator/ng-add-scrolling

Related bugs:

Bug #1204036: [Regression]Mouse wheel to change volume stopped working on Saucy	Undecided	Fix Released
Bug #1221242: [regression] middle-clicking on the sound indicator doesn't toggle the mute state	Undecided	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Charles Kerr (community)		2013-09-09	Approve on 2013-09-09
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-09
Review via email: mp+184567@code.staging.launchpad.net

Commit message

Expose scrolling and middle clicking to fix bug #1221242 and #1204036 (make scrolling and middle clicking work on the sound indicator)

Description of the change

Fixes bug #1221242 and #1204036 (make scrolling and middle clicking work on the sound indicator)

indicator already supported scrolling and secondary actions, but IndicatorNg never exposed them in any way. This patch does that, by supporting two additional attributes on the root menu item:

x-canonical-scroll-action: contains an action name of an action with an int32 parameter. Whenever the user scrolls the mouse wheel over an indicator, the associated action gets activated with the magnitude and direction (< 0 means scrolling down, > 0 means scrolling up).

x-canonical-secondary-action: contains an action name of a parameterless action. That action gets activated on middle clicking the indicator.

Both of these attributes are optional. I plan to document them on http://wiki.ubuntu.com/SystemComponents when everyone thinks they are a good idea (i.e., this gets merged).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-09:

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/libindicator-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/libindicator-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libindicator-ci/43/rebuild

review: Approve (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2013-09-09:

I like the idea behind this addition to the root menu action dict.

The patch is fine too. If I'm reading the diff right, it even fixes a potential (unlikely) leak we missed before, leaking G_MENU_ATTRIBUTE_ACTION strings that don't begin with "indicator."

looks like a g_message() snuck in by accident. Marking as "needs fixing" for that small issue only -- the rest is great.

review: Needs Fixing

lp://staging/~larsu/libindicator/ng-add-scrolling updated on 2013-09-09