enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Cleanup. 

SVN revision: 14708
This commit is contained in:
sebastid 2005-05-11 13:13:43 +00:00 committed by sebastid
parent 23e32dcf11
commit 4dc2deb902
4 changed files with 104 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/e_border.c
View File

@ -1425,7 +1425,11 @@ _e_border_cb_window_show_request(void *data, int ev_type, void *ev)
e = ev; e = ev;
bd = e_border_find_by_client_window(e->win); bd = e_border_find_by_client_window(e->win);
if (!bd) return 1; if (!bd)
{
printf("BUG: Need this border: 0x%x\n", e->win);
return 1;
}
return 1; return 1;
} }
@ -1517,7 +1521,7 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ', (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ',
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' ' (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' '
); );
{
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) || if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)) (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y))
{ {
@ -1626,7 +1630,6 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
/* FIXME: do */ /* FIXME: do */
} }
} }
}
return 1; return 1;
} }

16
src/bin/e_gadman.c
View File

@ -259,11 +259,11 @@ e_gadman_client_load(E_Gadman_Client *gmc)
} }
_e_gadman_client_overlap_deny(gmc); _e_gadman_client_overlap_deny(gmc);
e_object_ref(E_OBJECT(gmc)); e_object_ref(E_OBJECT(gmc));
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE);
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_EDGE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_EDGE);
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
e_object_unref(E_OBJECT(gmc)); e_object_unref(E_OBJECT(gmc));
@ -291,9 +291,9 @@ e_gadman_client_zone_set(E_Gadman_Client *gmc, E_Zone *zone)
gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax); gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay); gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
e_object_ref(E_OBJECT(gmc)); e_object_ref(E_OBJECT(gmc));
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE);
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
e_object_unref(E_OBJECT(gmc)); e_object_unref(E_OBJECT(gmc));
} }
@ -1228,17 +1228,17 @@ _e_gadman_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
_e_gadman_client_geometry_to_align(gmc); _e_gadman_client_geometry_to_align(gmc);
_e_gadman_client_geometry_apply(gmc); _e_gadman_client_geometry_apply(gmc);
e_object_ref(E_OBJECT(gmc)); e_object_ref(E_OBJECT(gmc));
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
{ {
if (new_zone) if (new_zone)
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_ZONE);
} }
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
{ {
if (new_edge) if (new_edge)
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_EDGE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_EDGE);
} }
if (!e_object_del_get(E_OBJECT(gmc))) if (!e_object_is_del(E_OBJECT(gmc)))
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE); _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
e_object_unref(E_OBJECT(gmc)); e_object_unref(E_OBJECT(gmc));

2
src/bin/e_object.c
View File

@ -56,7 +56,7 @@ e_object_del(E_Object *obj)
} }
int int
e_object_del_get(E_Object *obj) e_object_is_del(E_Object *obj)
{ {
E_OBJECT_CHECK_RETURN(obj, 1); E_OBJECT_CHECK_RETURN(obj, 1);
return obj->deleted; return obj->deleted;

2
src/bin/e_object.h
View File

@ -74,7 +74,7 @@ struct _E_Object
EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func); EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func);
EAPI void e_object_del (E_Object *obj); EAPI void e_object_del (E_Object *obj);
EAPI int e_object_del_get (E_Object *obj); EAPI int e_object_is_del (E_Object *obj);
EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func); EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func);
EAPI void e_object_type_set (E_Object *obj, int type); EAPI void e_object_type_set (E_Object *obj, int type);
EAPI void e_object_free (E_Object *obj); EAPI void e_object_free (E_Object *obj);