add null checks to external comp api

SVN revision: 83068
This commit is contained in:
Mike Blumenkrantz 2013-01-22 10:18:53 +00:00
parent b0c585cedd
commit 0c524f1094
1 changed files with 9 additions and 9 deletions

View File

@ -4473,7 +4473,7 @@ e_comp_shadows_reset(void)
EAPI Evas * EAPI Evas *
e_comp_evas_get(E_Comp *c) e_comp_evas_get(E_Comp *c)
{ {
return c->evas; return c ? c->evas : NULL;
} }
EAPI void EAPI void
@ -4517,28 +4517,28 @@ e_comp_src_list_get(E_Comp *c)
EAPI Evas_Object * EAPI Evas_Object *
e_comp_src_image_get(E_Comp_Win *cw) e_comp_src_image_get(E_Comp_Win *cw)
{ {
if (!cw->c) return NULL; if ((!cw) || (!cw->c)) return NULL;
return cw->obj; return cw->obj;
} }
EAPI Evas_Object * EAPI Evas_Object *
e_comp_src_shadow_get(E_Comp_Win *cw) e_comp_src_shadow_get(E_Comp_Win *cw)
{ {
if (!cw->c) return NULL; if ((!cw) || (!cw->c)) return NULL;
return cw->shobj; return cw->shobj;
} }
EAPI Evas_Object * EAPI Evas_Object *
e_comp_src_image_mirror_add(E_Comp_Win *cw) e_comp_src_image_mirror_add(E_Comp_Win *cw)
{ {
if (!cw->c) return NULL; if ((!cw) || (!cw->c)) return NULL;
return _e_comp_win_mirror_add(cw); return _e_comp_win_mirror_add(cw);
} }
EAPI Eina_Bool EAPI Eina_Bool
e_comp_src_visible_get(E_Comp_Win *cw) e_comp_src_visible_get(E_Comp_Win *cw)
{ {
if (!cw->c) return EINA_FALSE; if ((!cw) || (!cw->c)) return EINA_FALSE;
return cw->visible; return cw->visible;
} }
@ -4565,27 +4565,27 @@ e_comp_src_hidden_set(E_Comp_Win *cw, Eina_Bool hidden)
EAPI Eina_Bool EAPI Eina_Bool
e_comp_src_hidden_get(E_Comp_Win *cw) e_comp_src_hidden_get(E_Comp_Win *cw)
{ {
if (!cw->c) return EINA_FALSE; if ((!cw) || (!cw->c)) return EINA_FALSE;
return cw->hidden_override; return cw->hidden_override;
} }
EAPI E_Popup * EAPI E_Popup *
e_comp_src_popup_get(E_Comp_Win *cw) e_comp_src_popup_get(E_Comp_Win *cw)
{ {
if (!cw->c) return NULL; if ((!cw) || (!cw->c)) return NULL;
return cw->pop; return cw->pop;
} }
EAPI E_Border * EAPI E_Border *
e_comp_src_border_get(E_Comp_Win *cw) e_comp_src_border_get(E_Comp_Win *cw)
{ {
if (!cw->c) return NULL; if ((!cw) || (!cw->c)) return NULL;
return cw->bd; return cw->bd;
} }
EAPI Ecore_X_Window EAPI Ecore_X_Window
e_comp_src_window_get(E_Comp_Win *cw) e_comp_src_window_get(E_Comp_Win *cw)
{ {
if (!cw->c) return 0; if ((!cw) || (!cw->c)) return 0;
return cw->win; return cw->win;
} }