navigator: properly set app_tracker root.

If window had modal descendant navigator still put window as
root object of app_tracker. This result in flat_navi was given
wrong top object.

[UIFWAC-43]

Change-Id: Ib169845173d07234ee083837794c1c32179bae3d

diff --git a/src/navigator.c b/src/navigator.c
index 655047d..b286cb3 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -2218,9 +2218,9 @@ static void on_window_activate(void *data, AtspiAccessible * window)
 
        if (window) {
                DEBUG("Window name: %s", atspi_accessible_get_name(window, NULL));
-               app_tracker_callback_register(window, _view_content_changed, NULL);
                // TODO: modal descendant of window should be used (if exists) otherwise window
                AtspiAccessible *modal_descendant = _get_modal_descendant(window);
+               app_tracker_callback_register(modal_descendant ? modal_descendant : window, _view_content_changed, NULL);
                _view_content_changed(modal_descendant ? modal_descendant : window, NULL);
                g_object_unref(modal_descendant);
        } else {