From ea3f93025b4bef5b2042142e7656737131e5db33 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <m.blumenkran@samsung.com>
Date: Fri, 22 Feb 2013 11:10:32 +0000
Subject: [PATCH] set border transparency more accurately when adopting windows
 in comp

---
 src/bin/e_border.c | 2 +-
 src/bin/e_comp.c   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 5b9f903d2..03e55aeb6 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8477,7 +8477,7 @@ _e_border_eval0(E_Border *bd)
     * and relevant netwm atom
     * ...eventually
     */
-   e_comp_win_opacity_set(bd->cw, bd->client.netwm.opacity);
+   if (bd->cw) e_comp_win_opacity_set(bd->cw, bd->client.netwm.opacity);
 
    if (change_urgent)
      {
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index f9dfc3b63..428f0d69e 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -2025,6 +2025,7 @@ _e_comp_win_add(E_Comp *c, Ecore_X_Window win)
         cw->dfn = e_object_delfn_add(E_OBJECT(cw->bd), _e_comp_object_del, cw);
         cw->shape = cw->bd->shape;
         cw->bd->cw = cw;
+        cw->opacity = cw->bd->client.netwm.opacity;
         // setup on show
         // _e_comp_win_sync_setup(cw, cw->bd->client.win);
      }
@@ -2181,6 +2182,7 @@ _e_comp_win_add(E_Comp *c, Ecore_X_Window win)
         // ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
         cw->dmg_updates = 0;
      }
+   if (cw->bd) e_comp_win_opacity_set(cw, cw->opacity);
    DBG("  [0x%x] add", cw->win);
    if (conf->grab) ecore_x_ungrab();
    return cw;