forked from enlightenment/enlightenment
parent
9af24491cf
commit
1a7c41f86a
|
@ -81,7 +81,7 @@ static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *c
|
|||
static Eina_Bool _e_gadcon_provider_populate_idler(void *data);
|
||||
static Eina_Bool _e_gadcon_custom_populate_idler(void *data);
|
||||
|
||||
static int _e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
|
||||
static int _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
|
||||
|
||||
typedef struct _E_Smart_Data E_Smart_Data;
|
||||
typedef struct _E_Layout_Item_Container E_Layout_Item_Container;
|
||||
|
@ -93,7 +93,7 @@ static void _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd);
|
|||
static Eina_List *_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd);
|
||||
static void _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list);
|
||||
static void _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **list);
|
||||
static E_Layout_Item_Container * _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2);
|
||||
static E_Layout_Item_Container *_e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2);
|
||||
static void _e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd, E_Layout_Item_Container *lc);
|
||||
static void _e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Container *lc, E_Layout_Item_Container *lc2);
|
||||
static void _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_Layout_Item_Container **lc_moving, E_Layout_Item_Container *lc_back, Eina_List **con_list);
|
||||
|
@ -358,7 +358,7 @@ e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
|
||||
e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -367,7 +367,7 @@ e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func) (void *data, E
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
|
||||
e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -376,7 +376,7 @@ e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func) (void *data, E_Gad
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func) (void *data, E_Gadcon_Client *gcc, const char *style), void *data)
|
||||
e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -385,7 +385,7 @@ e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func) (void *da
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data)
|
||||
e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -564,6 +564,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
|
|||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
horiz = 1;
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -573,6 +574,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
|
|||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
horiz = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -680,7 +682,7 @@ e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data)
|
||||
e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -689,7 +691,7 @@ e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func) (void *data, E_Gad
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func) (void *data, int lock), void *data)
|
||||
e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -698,7 +700,7 @@ e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func) (void *data, int lock), v
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func) (void *data), void *data)
|
||||
e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
|
@ -858,6 +860,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, c
|
|||
case E_GADCON_ORIENT_CORNER_BR:
|
||||
e_box_orientation_set(gcc->o_box, 1);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -867,6 +870,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id __UNUSED__, c
|
|||
case E_GADCON_ORIENT_CORNER_RB:
|
||||
e_box_orientation_set(gcc->o_box, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -925,7 +929,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
|
|||
e_theme_edje_object_set(gcc->o_control, "base/theme/gadman",
|
||||
"e/gadman/control");
|
||||
|
||||
if ((gcc->autoscroll)/* || (gcc->resizable)*/)
|
||||
if ((gcc->autoscroll) /* || (gcc->resizable)*/)
|
||||
{
|
||||
if (e_box_orientation_get(gcc->o_box))
|
||||
edje_object_signal_emit(gcc->o_control, "e,state,hsize,on", "e");
|
||||
|
@ -1105,6 +1109,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
|
|||
else if (gcc->o_base)
|
||||
e_gadcon_layout_pack_size_set(gcc->o_base, w);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_VERT:
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
case E_GADCON_ORIENT_RIGHT:
|
||||
|
@ -1113,6 +1118,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h)
|
|||
else if (gcc->o_base)
|
||||
e_gadcon_layout_pack_size_set(gcc->o_base, h);
|
||||
break;
|
||||
|
||||
case E_GADCON_ORIENT_FLOAT:
|
||||
case E_GADCON_ORIENT_CORNER_TL:
|
||||
case E_GADCON_ORIENT_CORNER_TR:
|
||||
|
@ -1280,7 +1286,8 @@ e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int
|
|||
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
|
||||
|
||||
if (gcc->o_box) evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else if (gcc->o_base) evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else if (gcc->o_base)
|
||||
evas_object_geometry_get(gcc->o_base, x, y, w, h);
|
||||
else
|
||||
{
|
||||
if (x) *x = 0;
|
||||
|
@ -1303,7 +1310,7 @@ static void
|
|||
_e_gadcon_client_change_gadcon(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
||||
{
|
||||
E_Gadcon_Location *src, *dst;
|
||||
E_Gadcon_Client * gcc;
|
||||
E_Gadcon_Client *gcc;
|
||||
|
||||
gcc = data;
|
||||
src = gcc->gadcon->location;
|
||||
|
@ -1312,11 +1319,11 @@ _e_gadcon_client_change_gadcon(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
|||
}
|
||||
|
||||
static void
|
||||
_e_gadcon_add_locations_menu_for_site(E_Menu *m, E_Gadcon_Client *gcc, E_Gadcon_Site site, int * count)
|
||||
_e_gadcon_add_locations_menu_for_site(E_Menu *m, E_Gadcon_Client *gcc, E_Gadcon_Site site, int *count)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
const Eina_List *l;
|
||||
E_Gadcon_Location * loc;
|
||||
E_Gadcon_Location *loc;
|
||||
int k = *count;
|
||||
|
||||
EINA_LIST_FOREACH(gadcon_locations, l, loc)
|
||||
|
@ -1567,7 +1574,8 @@ e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord
|
|||
else d = 0;
|
||||
}
|
||||
if (d < 0.0) d = 0.0;
|
||||
else if (d > 1.0) d = 1.0;
|
||||
else if (d > 1.0)
|
||||
d = 1.0;
|
||||
if (!gcc->scroll_timer)
|
||||
gcc->scroll_timer =
|
||||
ecore_timer_add(0.01, _e_gadcon_cb_client_scroll_timer, gcc);
|
||||
|
@ -1590,19 +1598,19 @@ e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data)
|
|||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_shelf(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_SHELF);
|
||||
return site == E_GADCON_SITE_SHELF;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_desktop(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_DESKTOP);
|
||||
return site == E_GADCON_SITE_DESKTOP;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site)
|
||||
{
|
||||
return (site == E_GADCON_SITE_EFM_TOOLBAR);
|
||||
return site == E_GADCON_SITE_EFM_TOOLBAR;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
|
@ -1614,6 +1622,7 @@ e_gadcon_site_is_any_toolbar(E_Gadcon_Site site)
|
|||
case E_GADCON_SITE_TOOLBAR:
|
||||
case E_GADCON_SITE_EFM_TOOLBAR:
|
||||
return EINA_TRUE;
|
||||
|
||||
default:
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
@ -1629,6 +1638,7 @@ e_gadcon_site_is_not_toolbar(E_Gadcon_Site site)
|
|||
case E_GADCON_SITE_TOOLBAR:
|
||||
case E_GADCON_SITE_EFM_TOOLBAR:
|
||||
return EINA_FALSE;
|
||||
|
||||
default:
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
@ -1869,7 +1879,7 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
|
|||
w = h = 50;
|
||||
e_drag_object_set(drag, o);
|
||||
e_drag_resize(drag, w, h);
|
||||
e_drag_start(drag, x + w/2, y + h/2);
|
||||
e_drag_start(drag, x + w / 2, y + h / 2);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2075,7 +2085,7 @@ _e_gadcon_cb_client_resize(void *data, Evas *evas __UNUSED__, Evas_Object *obj,
|
|||
static void
|
||||
_e_gadcon_client_move_start(E_Gadcon_Client *gcc)
|
||||
{
|
||||
int x, y, gcx, gcy, gy ,gx;
|
||||
int x, y, gcx, gcy, gy, gx;
|
||||
|
||||
evas_object_raise(gcc->o_event);
|
||||
evas_object_stack_below(gcc->o_control, gcc->o_event);
|
||||
|
@ -2223,7 +2233,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
|
|||
evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
|
||||
gcc->config.res = h;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
gcc->dx += x;
|
||||
|
@ -2534,7 +2543,8 @@ _e_gadcon_cb_dnd_move(void *data, const char *type __UNUSED__, void *event)
|
|||
/* If we move in the same gadcon as the client originates */
|
||||
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
|
||||
/* If we move in the newly entered gadcon */
|
||||
else if (new_gcc->gadcon == gc) gcc = new_gcc;
|
||||
else if (new_gcc->gadcon == gc)
|
||||
gcc = new_gcc;
|
||||
if (gcc)
|
||||
{
|
||||
Evas_Coord dx, dy;
|
||||
|
@ -2595,7 +2605,8 @@ _e_gadcon_cb_drop(void *data, const char *type __UNUSED__, void *event __UNUSED_
|
|||
|
||||
gc = data;
|
||||
if (drag_gcc->gadcon == gc) gcc = drag_gcc;
|
||||
else if ((new_gcc) && (new_gcc->gadcon == gc)) gcc = new_gcc;
|
||||
else if ((new_gcc) && (new_gcc->gadcon == gc))
|
||||
gcc = new_gcc;
|
||||
else return; /* make clang happy */
|
||||
|
||||
gc->cf->clients = eina_list_append(gc->cf->clients, gcc->cf);
|
||||
|
@ -2763,10 +2774,11 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m __UNUSED__, E_Menu_Ite
|
|||
_e_gadcon_client_save(gcc);
|
||||
e_gadcon_layout_thaw(gcc->gadcon->o_container);
|
||||
}
|
||||
|
||||
/*
|
||||
static void
|
||||
_e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
static void
|
||||
_e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Gadcon_Client *gcc;
|
||||
|
||||
gcc = data;
|
||||
|
@ -2776,8 +2788,8 @@ _e_gadcon_client_cb_menu_resizable(void *data, E_Menu *m __UNUSED__, E_Menu_Item
|
|||
e_gadcon_client_resizable_set(gcc, gcc->resizable);
|
||||
_e_gadcon_client_save(gcc);
|
||||
e_gadcon_layout_thaw(gcc->gadcon->o_container);
|
||||
}
|
||||
*/
|
||||
}
|
||||
*/
|
||||
static void
|
||||
_e_gadcon_client_cb_menu_edit(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
|
@ -3563,7 +3575,6 @@ _e_gadcon_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
|||
{
|
||||
sd->w = h;
|
||||
sd->h = w;
|
||||
|
||||
}
|
||||
|
||||
_e_gadcon_layout_smart_reconfigure(sd);
|
||||
|
@ -3770,7 +3781,7 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
|
|||
if (bi->ask.size2 - reduce_by > 8)
|
||||
{
|
||||
bi->ask.size2 -= reduce_by;
|
||||
need -= reduce_by ;
|
||||
need -= reduce_by;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -3794,8 +3805,10 @@ _e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2
|
|||
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
|
||||
|
||||
if ((!bi->gcc->state_info.seq) && (!bi2->gcc->state_info.seq)) return 0;
|
||||
else if (!bi->gcc->state_info.seq) return 1;
|
||||
else if (!bi2->gcc->state_info.seq) return -1;
|
||||
else if (!bi->gcc->state_info.seq)
|
||||
return 1;
|
||||
else if (!bi2->gcc->state_info.seq)
|
||||
return -1;
|
||||
return bi->gcc->state_info.seq - bi2->gcc->state_info.seq;
|
||||
}
|
||||
|
||||
|
@ -3807,7 +3820,7 @@ _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2)
|
|||
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
|
||||
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
|
||||
|
||||
return (bi->x - bi2->x);
|
||||
return bi->x - bi2->x;
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -3818,7 +3831,8 @@ _e_gadcon_layout_smart_containers_sort_cb(const void *d1, const void *d2)
|
|||
lc = d1;
|
||||
lc2 = d2;
|
||||
if (lc->pos < lc2->pos) return -1;
|
||||
else if (lc->pos > lc2->pos) return 1;
|
||||
else if (lc->pos > lc2->pos)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -3829,7 +3843,7 @@ _e_gadcon_layout_smart_seq_sort_cb(const void *d1, const void *d2)
|
|||
|
||||
bi = d1;
|
||||
bi2 = d2;
|
||||
return (bi->gcc->state_info.seq - bi2->gcc->state_info.seq);
|
||||
return bi->gcc->state_info.seq - bi2->gcc->state_info.seq;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -3895,7 +3909,7 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
|
|||
|
||||
bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
|
||||
|
||||
if (bi2->x + bi2->w/2 > bi->ask.pos + bi->w)
|
||||
if (bi2->x + bi2->w / 2 > bi->ask.pos + bi->w)
|
||||
{
|
||||
bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
|
||||
return;
|
||||
|
@ -3929,7 +3943,7 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
|
|||
l->data = tp;
|
||||
bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
|
||||
|
||||
if (bi->ask.pos > bi2->x + bi2->w/2)
|
||||
if (bi->ask.pos > bi2->x + bi2->w / 2)
|
||||
{
|
||||
bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
|
||||
return;
|
||||
|
@ -4048,7 +4062,6 @@ _e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
|
|||
E_Layout_Item_Container *lc;
|
||||
E_Gadcon_Layout_Item *bi;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
bi = evas_object_data_get(item, "e_gadcon_layout_data");
|
||||
|
@ -4443,7 +4456,7 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **lis
|
|||
|
||||
*list = eina_list_sort(*list, eina_list_count(*list), _e_gadcon_layout_smart_containers_sort_cb);
|
||||
|
||||
__reposition_again:
|
||||
__reposition_again:
|
||||
EINA_LIST_FOREACH(*list, l, lc)
|
||||
{
|
||||
if (!eina_list_next(l)) continue;
|
||||
|
@ -4936,7 +4949,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
|
|||
lc2->state = E_LAYOUT_ITEM_CONTAINER_STATE_NONE;
|
||||
EINA_LIST_FOREACH(lc->items, l3, bi2)
|
||||
{
|
||||
if(l2 == l3) break;
|
||||
if (l2 == l3) break;
|
||||
lc2->items = eina_list_append(lc2->items, bi2);
|
||||
if (l3 == lc->items)
|
||||
{
|
||||
|
@ -5086,12 +5099,12 @@ _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc)
|
|||
/* gadgets movement between different gadcons */
|
||||
|
||||
EAPI E_Gadcon_Location *
|
||||
e_gadcon_location_new(const char * name,
|
||||
e_gadcon_location_new(const char *name,
|
||||
E_Gadcon_Site site,
|
||||
int (*add_func) (void *data, const E_Gadcon_Client_Class *cc),
|
||||
void * add_data,
|
||||
void (*remove_func) (void *data, E_Gadcon_Client *cc),
|
||||
void * remove_data)
|
||||
int (*add_func)(void *data, const E_Gadcon_Client_Class *cc),
|
||||
void *add_data,
|
||||
void (*remove_func)(void *data, E_Gadcon_Client *cc),
|
||||
void *remove_data)
|
||||
{
|
||||
E_Gadcon_Location *loc;
|
||||
|
||||
|
@ -5125,19 +5138,19 @@ e_gadcon_location_free(E_Gadcon_Location *loc)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_location_register(E_Gadcon_Location * loc)
|
||||
e_gadcon_location_register(E_Gadcon_Location *loc)
|
||||
{
|
||||
gadcon_locations = eina_list_append(gadcon_locations, loc);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_location_unregister(E_Gadcon_Location * loc)
|
||||
e_gadcon_location_unregister(E_Gadcon_Location *loc)
|
||||
{
|
||||
gadcon_locations = eina_list_remove(gadcon_locations, loc);
|
||||
}
|
||||
|
||||
static int
|
||||
_e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst)
|
||||
_e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst)
|
||||
{
|
||||
E_Gadcon_Client_Class *cc;
|
||||
|
||||
|
|
Loading…
Reference in New Issue