discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c8ba69e3bfab1ebae2510a8d1217a971eeff1aac
commit c8ba69e3bfab1ebae2510a8d1217a971eeff1aac Author: Mike Blumenkrantz <[email protected]> Date: Thu Feb 6 12:33:39 2014 -0500 gadgets now delete the right menu when menu is deactivated T906 --- src/bin/e_gadcon.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 7d87891..0b5ade5 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -3119,13 +3119,17 @@ _e_gadcon_client_class_feature_check(const E_Gadcon_Client_Class *cc, const char } static void -_e_gadcon_client_cb_menu_post(void *data, E_Menu *m __UNUSED__) +_e_gadcon_client_cb_menu_post(void *data, E_Menu *m) { E_Gadcon_Client *gcc; if (!(gcc = data)) return; if (gcc->gadcon) e_gadcon_locked_set(gcc->gadcon, 0); - if (!gcc->menu) return; + if (gcc->menu != m) + { + e_object_del(E_OBJECT(m)); + return; + } if (gcc->gadcon && gcc->gadcon->shelf && (gcc->menu == gcc->gadcon->shelf->menu)) gcc->gadcon->shelf->menu = NULL; e_object_del(E_OBJECT(gcc->menu)); gcc->menu = NULL; --
