From: Doyoun Kang <doyoun.kang@samsung.com>
Date: Thu, 1 Aug 2013 11:44:03 +0000 (+0900)
Subject: [E_BORDER] Add missing code to delete timer when the window gets DEICONIFY_APPROVE... 
X-Git-Tag: 2.2_release~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fe17.git;a=commitdiff_plain;h=dc6ffd92c4b6d55bd7efca8e4a57a5492252b992

[E_BORDER] Add missing code to delete timer when the window gets DEICONIFY_APPROVE event

Change-Id: I65d43ee1df3044818fe5a2bd5130c87f433b9427
---

diff --git a/packaging/e17.spec b/packaging/e17.spec
index 66e38d2..e1649b9 100644
--- a/packaging/e17.spec
+++ b/packaging/e17.spec
@@ -1,7 +1,7 @@
 Name:       e17
 Summary:    The Enlightenment window manager
 Version:    1.0.0.001+svn.76808slp2+build46
-Release:    1
+Release:    2
 Group:      System/GUI/Other
 License:    BSD
 URL:        http://www.enlightenment.org/
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index f95158e..b1f5316 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -7086,6 +7086,13 @@ _e_border_cb_client_message(void *data  __UNUSED__,
                          {
                             ecore_timer_del(ancestor_bd->client.e.state.deiconify_approve.wait_timer);
                             ancestor_bd->client.e.state.deiconify_approve.wait_timer = NULL;
+
+                            if (bd->client.e.state.deiconify_approve.wait_timer)
+                              {
+                                 ecore_timer_del(bd->client.e.state.deiconify_approve.wait_timer);
+                                 bd->client.e.state.deiconify_approve.wait_timer = NULL;
+                              }
+
                             e_border_uniconify(ancestor_bd);
                          }
                        else