From: Enlightenment S. <no-...@en...> - 2009-11-09 12:50:27
|
Log: Formatting. Author: devilhorns Date: 2009-11-09 04:50:16 -0800 (Mon, 09 Nov 2009) New Revision: 43577 Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c Modified: trunk/TMP/st/elementary/src/lib/elm_notify.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-11-09 12:46:31 UTC (rev 43576) +++ trunk/TMP/st/elementary/src/lib/elm_notify.c 2009-11-09 12:50:16 UTC (rev 43577) @@ -84,8 +84,8 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord x,y,w,h; - if(!wd->parent) return ; + if (!wd->parent) return; evas_object_geometry_get(wd->parent, &x, &y, &w, &h); evas_object_resize(obj, w, h); evas_object_move(obj, x, y); @@ -166,7 +166,6 @@ } } - static int _timer_cb(void *data) { @@ -287,11 +286,10 @@ if(wd->content) { evas_object_event_callback_del_full(wd->content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->content, - EVAS_CALLBACK_RESIZE, - _content_resize, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->content, EVAS_CALLBACK_RESIZE, + _content_resize, obj); evas_object_del(wd->content); wd->content = NULL; } @@ -303,11 +301,10 @@ edje_object_part_swallow(wd->notify, "elm.swallow.content", content); evas_object_event_callback_add(content, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_add(content, - EVAS_CALLBACK_RESIZE, - _content_resize, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE, + _content_resize, obj); _sizing_eval(obj); } _calc(obj); @@ -329,20 +326,16 @@ if(wd->parent) { evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_RESIZE, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_MOVE, - _changed_size_hints, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_DEL, - _parent_del, obj); - evas_object_event_callback_del_full(wd->parent, - EVAS_CALLBACK_HIDE, - _parent_hide, obj); + EVAS_CALLBACK_CHANGED_SIZE_HINTS, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_MOVE, + _changed_size_hints, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_DEL, + _parent_del, obj); + evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_HIDE, + _parent_hide, obj); wd->parent = NULL; } @@ -353,17 +346,13 @@ evas_object_event_callback_add(parent, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_RESIZE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_MOVE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_MOVE, _changed_size_hints, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_DEL, + evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, _parent_del, obj); - evas_object_event_callback_add(parent, - EVAS_CALLBACK_HIDE, + evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE, _parent_hide, obj); _sizing_eval(obj); } @@ -469,8 +458,6 @@ elm_widget_resize_object_set(obj,wd->block_events); } else - { - evas_object_del(wd->block_events); - } + evas_object_del(wd->block_events); } |