forked from enlightenment/enlightenment
More gadcon->shelf checks before calling any shelf-specific functions.
SVN revision: 32868
This commit is contained in:
parent
0f0a57d127
commit
0509cb1a44
|
@ -1159,7 +1159,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
|
|||
E_OBJECT_CHECK(gcc);
|
||||
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
|
||||
|
||||
if (gcc->gadcon->shelf)
|
||||
if (gcc->gadcon->shelf)
|
||||
e_shelf_locked_set(gcc->gadcon->shelf, 1);
|
||||
e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post, gcc);
|
||||
|
||||
|
@ -2188,8 +2188,9 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
|
|||
{
|
||||
E_Menu *mn;
|
||||
int cx, cy, cw, ch;
|
||||
|
||||
e_shelf_locked_set(gcc->gadcon->shelf, 1);
|
||||
|
||||
if (gcc->gadcon->shelf)
|
||||
e_shelf_locked_set(gcc->gadcon->shelf, 1);
|
||||
mn = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post,
|
||||
gcc);
|
||||
|
|
Loading…
Reference in New Issue