Merge lp:~3v1n0/unity/scroll-api-merge into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Mirco Müller
Approved revision: 1266
Merged at revision: 1300
Proposed branch: lp:~3v1n0/unity/scroll-api-merge
Merge into: lp:unity
Diff against target: 14 lines (+2/-2)
1 file modified
services/panel-service.c (+2/-2)
To merge this branch: bzr merge lp:~3v1n0/unity/scroll-api-merge
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+66679@code.launchpad.net

Description of the change

Send the "entry-scrolled" signal instead of the old (duplicated) ones.
It follows the API change of libindicator. See related bug #804618 for more informations.

It needs the merge of lp:~3v1n0/libindicator/scroll-api-merge

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'services/panel-service.c'
2--- services/panel-service.c 2011-06-30 16:23:04 +0000
3+++ services/panel-service.c 2011-07-02 03:55:48 +0000
4@@ -1204,8 +1204,8 @@
5 IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
6 GdkScrollDirection direction = delta > 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
7
8- g_signal_emit_by_name(object, "scroll", abs(delta/120), direction);
9- g_signal_emit_by_name(object, "scroll-entry", entry, abs(delta/120), direction);
10+ g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry,
11+ abs(delta/120), direction);
12 }
13
14 void