gadgets now delete the right menu when menu is deactivated

T906
This commit is contained in:
Mike Blumenkrantz 2014-02-06 12:33:39 -05:00
parent 1b7b765ee4
commit c8ba69e3bf
1 changed files with 6 additions and 2 deletions

View File

@ -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;