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

[Marco Trevisan (Treviño)]

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

[Aurélien Gâteau (agateau)]

Hi Trevino,

Unfortunately your patch cannot be integrated: It only works for Oneiric as I understand, but unity-2d trunk targets Natty for now. In Oneiric the plan is for unity-2d-panel to switch to use unity-panel-service (this work is pending review), meaning we won't need unity-2d specific patches for scroll or secondary activate signals.

review: Disapprove

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

Ok... Cool anyway.

The unity-panel-service however has already support for this and for SecondaryActivate event thanks to some patches that I already sent upstream.

I'm also still working on it to control also the indicators order, so I guess I'll have to update unity-2d accordingly too once I've done.

[Aurélien Gâteau (agateau)]

> Ok... Cool anyway.
>
> The unity-panel-service however has already support for this and for
> SecondaryActivate event thanks to some patches that I already sent upstream.

Good, this means less duplication.

> I'm also still working on it to control also the indicators order, so I guess
> I'll have to update unity-2d accordingly too once I've done.

If your changes only affect unity-panel-service, there shouldn't be a need to update unity-2d. The code for the unity-panel-service powered panel is in lp:~agateau/unity-2d/unity-core if you want to give it a try.

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

> If your changes only affect unity-panel-service, there shouldn't be a need to
> update unity-2d. The code for the unity-panel-service powered panel is in
> lp:~agateau/unity-2d/unity-core if you want to give it a try.

The changes should affect also unity-2d since when it gets the Sync signal it should receive also the indicator order and to show the entries based on their order, not based on the parent indicator position.

However mine it's still a WIP and needs merging, but is something that was discussed at UDS: https://blueprints.launchpad.net/ubuntu/+spec/desktop-dx-o-indicators-review

Unmerged revisions

617. By Marco Trevisan (Treviño) on 2011-07-02

Use the "entry-scrolled" signal instead of the old ones

It follows the API change of libindicator

=== modified file 'panel/applets/indicator/indicator.c'
--- panel/applets/indicator/indicator.c	2011-07-02 03:57:29 +0000
+++ panel/applets/indicator/indicator.c	2011-07-02 03:57:29 +0000
@@ -160,8 +160,7 @@
 
 	g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
 
-	g_signal_emit_by_name (io, "scroll", 1, event->direction);
-	g_signal_emit_by_name (io, "scroll-entry", entry, 1, event->direction);
+	g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry, 1, event->direction);
 
 	return FALSE;
 }