diff options
| author | Christopher Michael <cpmichael1@comcast.net> | 2007-11-25 04:15:50 +0000 |
|---|---|---|
| committer | Christopher Michael <cpmichael1@comcast.net> | 2007-11-25 04:15:50 +0000 |
| commit | 0509cb1a443607e415ff4b2686f384fb5e74e15a (patch) | |
| tree | e3d11a4e466c389adc293bee46da9acf82b06d33 | |
| parent | 0f0a57d127abb6f8823cee65b126b3d6e93c9067 (diff) | |
| download | enlightenment-0509cb1a443607e415ff4b2686f384fb5e74e15a.tar.gz | |
More gadcon->shelf checks before calling any shelf-specific functions.
SVN revision: 32868
| -rw-r--r-- | src/bin/e_gadcon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 377fe12ecd..ecdb821f3c 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -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); |