[Xfce4-commits] [apps/xfdashboard] 03/03: Fix wrong conversion and iteration in xfdashboard_notify

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit 0281b359c4fd52b2bd301ed8ed9108ebfd80b98e
Author: Stephan Haller <nomad at froevel.de>
Date:   Tue Aug 25 13:10:11 2015 +0200

    Fix wrong conversion and iteration in xfdashboard_notify
---
 xfdashboard/utils.c |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/xfdashboard/utils.c b/xfdashboard/utils.c
index cb68239..a1e1854 100644
--- a/xfdashboard/utils.c
+++ b/xfdashboard/utils.c
@@ -101,8 +101,9 @@ void xfdashboard_notify(ClutterActor *inSender,
 	if(!stage)
 	{
 		const GSList					*stages;
-		const GSList					*iter;
-		XfdashboardStageInterface		*stageInterface;
+		const GSList					*stagesIter;
+		ClutterActorIter				interfaceIter;
+		ClutterActor					*child;
 		XfdashboardWindowTrackerMonitor	*stageMonitor;
 
 		/* Get stage manager to iterate through stages to find the one
@@ -122,15 +123,22 @@ void xfdashboard_notify(ClutterActor *inSender,
 			/* Iterate through list of all stage and lookup the one for
 			 * primary monitor.
 			 */
-			for(iter=stages; iter && !stage; iter=iter->next)
+			for(stagesIter=stages; stagesIter && !stage; stagesIter=stagesIter->next)
 			{
-				stageInterface=XFDASHBOARD_STAGE_INTERFACE(iter->data);
-				if(stageInterface)
+				/* Skip this stage if it is not a XfdashboardStage */
+				if(!XFDASHBOARD_IS_STAGE(stagesIter->data)) continue;
+
+				/* Iterate through stage's children and lookup stage interfaces */
+				clutter_actor_iter_init(&interfaceIter, CLUTTER_ACTOR(stagesIter->data));
+				while(clutter_actor_iter_next(&interfaceIter, &child))
 				{
-					stageMonitor=xfdashboard_stage_interface_get_monitor(stageInterface);
-					if(xfdashboard_window_tracker_monitor_is_primary(stageMonitor))
+					if(XFDASHBOARD_IS_STAGE_INTERFACE(child))
 					{
-						stage=XFDASHBOARD_STAGE(stageInterface);
+						stageMonitor=xfdashboard_stage_interface_get_monitor(XFDASHBOARD_STAGE_INTERFACE(child));
+						if(xfdashboard_window_tracker_monitor_is_primary(stageMonitor))
+						{
+							stage=XFDASHBOARD_STAGE(clutter_actor_get_stage(child));
+						}
 					}
 				}
 			}
@@ -138,7 +146,7 @@ void xfdashboard_notify(ClutterActor *inSender,
 			/* If we did not get stage for primary monitor use first stage */
 			if(!stage)
 			{
-				stage=XFDASHBOARD_STAGE(stages->data);
+				stage=XFDASHBOARD_STAGE(stagesIter->data);
 			}
 		}
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.