From 4a4f40215e63b1ee245809afcad0c95ece2eff64 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 13 Nov 2012 08:39:45 +0000 Subject: [PATCH] pass border to kill function as expected and don't kill anything if a non-border object was passed ticket #1769 SVN revision: 79206 --- src/bin/e_actions.c | 6 +----- src/bin/e_int_border_menu.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index b157f23ff..44f26a0a1 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -344,11 +344,7 @@ ACT_FN_GO(window_kill, __UNUSED__) if (!obj) obj = E_OBJECT(e_border_focused_get()); if (!obj) return; - if (obj->type != E_BORDER_TYPE) - { - obj = E_OBJECT(e_border_focused_get()); - if (!obj) return; - } + if (obj->type != E_BORDER_TYPE) return; bd = (E_Border *)obj; if ((bd->lock_close) || (bd->internal)) return; diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index 2f24bbed3..ce30f7f29 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -326,7 +326,7 @@ _e_border_menu_cb_kill(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSE if ((bd->lock_close) || (bd->internal)) return; a = e_action_find("window_kill"); - if ((a) && (a->func.go)) a->func.go(NULL, NULL); + if ((a) && (a->func.go)) a->func.go(E_OBJECT(bd), NULL); } static void