Merge lp:~3v1n0/unity/scroll-event-support into lp:unity

[Marco Trevisan (Treviño)]

unity (panel-service, in fact): now sends also a "scroll-entry" signal when an indicator is scrolled, with the target entry as parameter.

This depends on:
lp:~3v1n0/libindicator/scroll-event-support
lp:~3v1n0/indicator-application/scroll-event-support
lp:~3v1n0/libappindicator/scroll-event-support

This is part of the Indicators "scroll-event" support patch, see bug #708180

[Mirco Müller (macslow)]

Looks good to me

review: Approve

[Mirco Müller (macslow)]

But before merging this we need to make sure all the other patches land _before_ this one is merged to untiy trunk.

[Marco Trevisan (Treviño) (3v1n0)]

To get it working yes, however in Unity merging the patch shouldn't cause build breakage (the signal simply won't cause any effect). The only "strong" dependency here is between libindicator and indicator-application

[Ted Gould (ted)]

libinidcator changes for this were released yesterday in libindicator 0.3.18

[Alex Launi (alexlauni)]

Looks good but before we merge it we need you to sign the Canonical contributer agreement. It's a quick, but necessary step to getting your code into the tree. Luckily you only need to sign it once and it will apply to all other Canonical project contributions you may make in the future. http://www.canonical.com/contributors Make sure to CC David Barth when you send it in.

[Marco Trevisan (Treviño) (3v1n0)]

> Looks good but before we merge it we need you to sign the Canonical
> contributer agreement. It's a quick, but necessary step to getting your code
> into the tree. Luckily you only need to sign it once and it will apply to all
> other Canonical project contributions you may make in the future.
> http://www.canonical.com/contributors Make sure to CC David Barth when you
> send it in.

Well, I've already signed and sent it to Ted Gould when my branch for indicator-datetime was merged!
Don't you have it?

[Alex Launi (alexlauni)]

I think someone forgot to update the list. I will look into it and merge asap. Thanks!

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2010-12-29 17:30:12 +0000
+++ services/panel-service.c	2011-01-27 00:02:25 +0000
@@ -1005,7 +1005,9 @@
   IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
   IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
   GdkScrollDirection direction = delta > 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
+
   g_signal_emit_by_name(object, "scroll", abs(delta/120), direction);
+  g_signal_emit_by_name(object, "scroll-entry", entry, abs(delta/120), direction);
 }
 
 void