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

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

commit 683f5048c1dc37af503709e3c8666efce77f6ba5
Author: Stephan Haller <[email protected]>
Date:   Sat Apr 30 10:30:16 2016 +0200

    Viewpad did not find a view by its internal name as it checked against the 
wrong expected return result :(
    
    This fixes GH #124 where the bug was reported that switching to a requested 
view on application start-up or resume does not anymore.
---
 libxfdashboard/viewpad.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libxfdashboard/viewpad.c b/libxfdashboard/viewpad.c
index d7cac16..eb8c3d6 100644
--- a/libxfdashboard/viewpad.c
+++ b/libxfdashboard/viewpad.c
@@ -777,10 +777,11 @@ static void 
_xfdashboard_viewpad_on_view_unregistered(XfdashboardViewpad *self,
                /* Check if child is a view otherwise continue iterating */
                if(XFDASHBOARD_IS_VIEW(child)!=TRUE) continue;
 
-               /* If child is not of type being unregistered it will get
-                * the first activatable view after we destroyed all views 
found.
+               /* If this child is not the one being unregistered and is not
+                * disabled then it will get the first activatable view after
+                * we destroyed all views found.
                 */
-               if(xfdashboard_view_has_id(XFDASHBOARD_VIEW(child), 
inID)==FALSE)
+               if(!xfdashboard_view_has_id(XFDASHBOARD_VIEW(child), inID))
                {
                        
if(xfdashboard_view_get_enabled(XFDASHBOARD_VIEW(child))) 
firstActivatableView=child;
                }
@@ -1532,7 +1533,7 @@ XfdashboardView* 
xfdashboard_viewpad_find_view_by_id(XfdashboardViewpad *self, c
        {
                /* Check if child is a view and its internal name matches 
requested name */
                if(XFDASHBOARD_IS_VIEW(child)==TRUE &&
-                       xfdashboard_view_has_id(XFDASHBOARD_VIEW(child), 
inID)==0)
+                       xfdashboard_view_has_id(XFDASHBOARD_VIEW(child), inID))
                {
                        view=XFDASHBOARD_VIEW(child);
                }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to