add code to reset launching flag while handling map window

there was a bug that the "e,action,launch_real,done" event was sent twice
in handing map window, ending effect.

Change-Id: I68e48fcaf802ff54fb874860d75a91677ababeed

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index a5c610e783b275d5d3de5ee2b114dc727fdabb41..a38a4559d923f00f4f403868d97e4945d4e890b2 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4887,7 +4887,7 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
           (e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)))) ||
        (just_do_it))
      {
-        ELOG("Set launching flag..", ec->pixmap, ec);
+        ELOGF("COMP", "Set launching flag..", ec->pixmap, ec);
         ec->launching = EINA_TRUE;
 
         ec->exp_iconify.not_raise = 0;

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 52e5253cfbdaefde4c9d39950ebc7f141c8434e9..5de18735f317b3428bd9fa8698efc75c071635d7 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1027,6 +1027,7 @@ _e_comp_object_animating_end(E_Comp_Object *cw)
                     {
                        if (!cw->ec->extra_animating)
                          {
+                            ELOGF("COMP", "Un-Set launching flag..", cw->ec->pixmap, cw->ec);
                             cw->ec->launching = EINA_FALSE;
                             if (cw->ec->first_mapped)
                               {
@@ -1924,7 +1925,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
 
    if (cw->ec->launching == EINA_TRUE)
      {
-        ELOG("Hide. Cancel launching flag", cw->ec->pixmap, cw->ec);
+        ELOGF("COMP", "Hide. Cancel launching flag", cw->ec->pixmap, cw->ec);
         cw->ec->launching = EINA_FALSE;
      }
 
@@ -2819,7 +2820,7 @@ _e_comp_smart_show(Evas_Object *obj)
      {
         if (cw->ec->exp_iconify.by_client)
           {
-             ELOG("Set launching flag..", cw->ec->pixmap, cw->ec);
+             ELOGF("COMP", "Set launching flag..", cw->ec->pixmap, cw->ec);
              cw->ec->launching = EINA_TRUE;
           }
 
@@ -2828,7 +2829,7 @@ _e_comp_smart_show(Evas_Object *obj)
    else if (!cw->showing) /* if set, client was ec->hidden during show animation */
      {
         cw->showing = 1;
-        ELOG("Set launching flag..", cw->ec->pixmap, cw->ec);
+        ELOGF("COMP", "Set launching flag..", cw->ec->pixmap, cw->ec);
         cw->ec->launching = EINA_TRUE;
 
         e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index b9ada4aacdb970cc43c73405fdd8929ae076abb4..6353601c30274d12a2d997d960f2615c91905fbf 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -1158,6 +1158,8 @@ _e_xdg_shell_surface_map_cb_timer(void *data)
                }
           }
 
+        ELOGF("COMP", "Un-Set launching flag", ec->pixmap, ec);
+        ec->launching = EINA_FALSE;
         ec->first_mapped = 1;
         EC_CHANGED(ec);
      }
@@ -1259,6 +1261,8 @@ _e_xdg_shell_surface_map(struct wl_resource *resource)
                }
           }
 
+        ELOGF("COMP", "Un-Set launching flag..", ec->pixmap, ec);
+        ec->launching = EINA_FALSE;
         ec->first_mapped = 1;
         EC_CHANGED(ec);
      }