parent
06c0c4d5f3
commit
c3b0637802
|
@ -3457,4 +3457,3 @@ _action_groups_sort_cb(const void *d1, const void *d2)
|
|||
if (!(g2 = d2)) return -1;
|
||||
return strcmp(g1->act_grp, g2->act_grp);
|
||||
}
|
||||
|
||||
|
|
|
@ -77,4 +77,3 @@ e_alert_show(int sig)
|
|||
e_util_env_set("MTRACK", "track");
|
||||
ecore_app_restart();
|
||||
}
|
||||
|
||||
|
|
|
@ -1231,4 +1231,3 @@ _e_bindings_edge_cb_timer(void *data)
|
|||
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
|
@ -167,4 +167,3 @@ _e_canvas_cb_flush(void *data __UNUSED__)
|
|||
e_canvas_cache_flush();
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,4 +14,3 @@ e_config_descriptor_new(const char *name, int size)
|
|||
|
||||
return (E_Config_DD *) eet_data_descriptor_stream_new(&eddc);
|
||||
}
|
||||
|
||||
|
|
|
@ -1164,7 +1164,7 @@ _e_container_resize_handle(E_Container *con)
|
|||
}
|
||||
else
|
||||
{
|
||||
E_Config_Shelf *cf_es;
|
||||
E_Config_Shelf *cf_es;
|
||||
|
||||
zone = e_zone_new(con, scr->screen, scr->escreen,
|
||||
scr->x, scr->y, scr->w, scr->h);
|
||||
|
|
|
@ -905,4 +905,3 @@ _e_desk_hide_animator(void *data)
|
|||
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
|
|
@ -1144,4 +1144,3 @@ _e_desklock_ask_presentation_mode(void)
|
|||
|
||||
_e_desklock_ask_presentation_dia = dia;
|
||||
}
|
||||
|
||||
|
|
|
@ -369,4 +369,3 @@ _e_dialog_cb_wid_on_focus(void *data, Evas_Object *obj)
|
|||
else if (dia->content_object)
|
||||
e_widget_focused_object_clear(dia->content_object);
|
||||
}
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj,
|
|||
void (*move_cb)(void *data, const char *type, void *event),
|
||||
void (*leave_cb)(void *data, const char *type, void *event),
|
||||
void (*drop_cb)(void *data, const char *type, void *event),
|
||||
const char **types, unsigned int num_types,
|
||||
const char **types, unsigned int num_types,
|
||||
int x, int y, int w, int h);
|
||||
EAPI void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h);
|
||||
EAPI int e_drop_inside(const E_Drop_Handler *handler, int x, int y);
|
||||
|
@ -150,4 +150,3 @@ EAPI Ecore_X_Atom e_drop_handler_action_get(void);
|
|||
#ifndef MIN
|
||||
# define MIN(x, y) (((x) > (y)) ? (y) : (x))
|
||||
#endif
|
||||
|
||||
|
|
|
@ -867,4 +867,3 @@ _dialog_save_cb(void *data __UNUSED__, void *data2)
|
|||
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,5 +13,3 @@ EAPI Eina_Bool e_filereg_file_protected(const char * path);
|
|||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -588,7 +588,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
int num = count - (cr)*(sd->cols);
|
||||
if (num < sd->cols)
|
||||
{
|
||||
ww = w / num;
|
||||
ww = w / num;
|
||||
}
|
||||
}
|
||||
ow = bi->min.w;
|
||||
|
@ -601,13 +601,13 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowbottom)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
|
@ -618,19 +618,19 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowbottom)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
|
||||
}
|
||||
evas_object_resize(obj, ow, oh);
|
||||
xx -= ww;
|
||||
evas_object_resize(obj, ow, oh);
|
||||
xx -= ww;
|
||||
}
|
||||
cc++;
|
||||
if (cc >= sd->cols)
|
||||
|
@ -642,7 +642,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
xx = x + w;
|
||||
if (sd->flowbottom)
|
||||
yy += hh;
|
||||
yy += hh;
|
||||
else
|
||||
yy -= hh;
|
||||
}
|
||||
|
@ -665,7 +665,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
int num = count - (cc)*(sd->rows);
|
||||
if (num < sd->rows)
|
||||
{
|
||||
hh = h / num;
|
||||
hh = h / num;
|
||||
}
|
||||
}
|
||||
oh = bi->min.h;
|
||||
|
@ -678,13 +678,13 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowright)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
|
@ -695,19 +695,19 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowright)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
|
||||
}
|
||||
evas_object_resize(obj, ow, oh);
|
||||
yy -= hh;
|
||||
evas_object_resize(obj, ow, oh);
|
||||
yy -= hh;
|
||||
}
|
||||
cr++;
|
||||
if (cr >= sd->rows)
|
||||
|
@ -719,7 +719,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
yy = y + h;
|
||||
if (sd->flowright)
|
||||
xx += ww;
|
||||
xx += ww;
|
||||
else
|
||||
xx -= ww;
|
||||
}
|
||||
|
@ -875,10 +875,10 @@ _e_flowlayout_smart_init(void)
|
|||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
|
|
|
@ -9878,4 +9878,3 @@ e_fm2_operation_abort(int id)
|
|||
e_fm2_op_registry_entry_abort(ere);
|
||||
e_fm2_op_registry_entry_unref(ere);
|
||||
}
|
||||
|
||||
|
|
|
@ -1439,4 +1439,3 @@ _e_fm_ipc_prepare_command(E_Fm_Op_Type type, const char *args)
|
|||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
|
|
@ -208,7 +208,7 @@ _e_fm_main_udisks_cb_dev_verify(const char *udi,
|
|||
_e_fm_main_udisks_storage_add(udi);
|
||||
else if (!strcmp(ret->val.s, "filesystem"))
|
||||
{
|
||||
INF("DB VOL+: %s", udi);
|
||||
INF("DB VOL+: %s", udi);
|
||||
_e_fm_main_udisks_volume_add(udi, EINA_TRUE);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -680,4 +680,3 @@ e_fm2_device_volume_list_get(void)
|
|||
{
|
||||
return _e_vols;
|
||||
}
|
||||
|
||||
|
|
|
@ -1537,4 +1537,3 @@ _e_fm_op_remove_atom(E_Fm_Op_Task *task)
|
|||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -5160,4 +5160,3 @@ _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon
|
|||
src->gadget_remove.func(src->gadget_remove.data, gcc);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -134,4 +134,3 @@ _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
|
|||
}
|
||||
last_focus_time = ecore_loop_time_get();
|
||||
}
|
||||
|
||||
|
|
|
@ -1491,4 +1491,3 @@ e_hints_scale_update(void)
|
|||
free(roots);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -590,7 +590,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_remember_del(rem);
|
||||
if (cfdata->border->remember)
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
_check_matches(rem, 1);
|
||||
|
|
|
@ -100,4 +100,3 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_list_object_append(o, ot, 1, 1, 0.5);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
|
|
@ -1038,4 +1038,3 @@ _e_intl_imc_dir_scan(const char *dir)
|
|||
}
|
||||
return imcs;
|
||||
}
|
||||
|
||||
|
|
|
@ -73,4 +73,3 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc)
|
|||
E_FREE(imc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -665,4 +665,3 @@ e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret)
|
|||
/* local subsystem globals */
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -219,4 +219,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1816,4 +1816,3 @@ _e_main_cb_startup_fake_end(void *data __UNUSED__)
|
|||
e_init_hide();
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
|
@ -208,9 +208,9 @@ e_manager_manage_windows(E_Manager *man)
|
|||
}
|
||||
/* XXX manage xembed windows as long as they are not override_redirect..
|
||||
* if (!ecore_x_window_prop_property_get(windows[i],
|
||||
* atom_xmbed,
|
||||
* atom_xmbed, 32,
|
||||
* &data, &count))
|
||||
* atom_xmbed,
|
||||
* atom_xmbed, 32,
|
||||
* &data, &count))
|
||||
* data = NULL;
|
||||
* if (!data) */
|
||||
{
|
||||
|
@ -1015,7 +1015,7 @@ _e_manager_cb_client_message(void *data __UNUSED__, int ev_type __UNUSED__, void
|
|||
causing the pointer to jump back and forth. */
|
||||
if ((e_config->focus_policy != E_FOCUS_CLICK) &&
|
||||
!(bd->client.icccm.name && !strcmp(bd->client.icccm.name, "VCLSalFrame")))
|
||||
ecore_x_pointer_warp(bd->zone->container->win,
|
||||
ecore_x_pointer_warp(bd->zone->container->win,
|
||||
bd->x + (bd->w / 2), bd->y + (bd->h / 2));
|
||||
e_border_focus_set(bd, 1, 1);
|
||||
}
|
||||
|
|
|
@ -338,4 +338,3 @@ _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *yy1, int
|
|||
if (yy1) *yy1 = cy1;
|
||||
if (y2) *y2 = cy2;
|
||||
}
|
||||
|
||||
|
|
|
@ -1166,7 +1166,7 @@ _e_menu_item_free(E_Menu_Item *mi)
|
|||
{
|
||||
mi->submenu->parent_item = NULL;
|
||||
e_object_unref(E_OBJECT(mi->submenu)); /* added on submenu_set() */
|
||||
/* e_object_del(E_OBJECT(mi->submenu)); */
|
||||
/* e_object_del(E_OBJECT(mi->submenu)); */
|
||||
}
|
||||
if (mi->menu->realized) _e_menu_item_unrealize(mi);
|
||||
mi->menu->items = eina_list_remove(mi->menu->items, mi);
|
||||
|
@ -2215,10 +2215,10 @@ _e_menu_item_activate_char(const char * key_compose)
|
|||
do
|
||||
{
|
||||
if (!eina_list_next(ll))
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
mi = eina_list_data_get(ll);
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
mi = eina_list_data_get(ll);
|
||||
}
|
||||
while (mi->separator);
|
||||
}
|
||||
|
|
|
@ -65,13 +65,13 @@ e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msg
|
|||
pos = size;
|
||||
if (name)
|
||||
{
|
||||
ev->name = ((char *)ev) + pos;
|
||||
ev->name = ((char *)ev) + pos;
|
||||
pos += name_len;
|
||||
strcpy(ev->name, name);
|
||||
}
|
||||
if (info)
|
||||
{
|
||||
ev->info = ((char *)ev) + pos;
|
||||
ev->info = ((char *)ev) + pos;
|
||||
strcpy(ev->info, info);
|
||||
}
|
||||
ev->val = val;
|
||||
|
|
|
@ -278,4 +278,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -645,4 +645,3 @@ _e_pointer_cb_idle_poller(void *data)
|
|||
}
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
|
|
@ -172,4 +172,3 @@ _e_powersave_event_update_free(void *data __UNUSED__, void *event)
|
|||
{
|
||||
free(event);
|
||||
}
|
||||
|
||||
|
|
|
@ -79,4 +79,3 @@ _e_randr_ask_memorize_monitor_cb(void *data, E_Dialog *dia)
|
|||
|
||||
e_object_del(E_OBJECT(dia));
|
||||
}
|
||||
|
||||
|
|
|
@ -114,8 +114,8 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
|
|||
{
|
||||
_e_resist_rects(rects,
|
||||
px, py, pw, ph,
|
||||
x, y, w, h,
|
||||
rx, ry, rw, rh);
|
||||
x, y, w, h,
|
||||
rx, ry, rw, rh);
|
||||
|
||||
E_FREE_LIST(rects, E_FREE);
|
||||
}
|
||||
|
@ -152,8 +152,8 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist __UNUSE
|
|||
{
|
||||
_e_resist_rects(rects,
|
||||
px, py, pw, ph,
|
||||
x, y, w, h,
|
||||
rx, ry, NULL, NULL);
|
||||
x, y, w, h,
|
||||
rx, ry, NULL, NULL);
|
||||
|
||||
E_FREE_LIST(rects, E_FREE);
|
||||
}
|
||||
|
@ -163,8 +163,8 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist __UNUSE
|
|||
static void
|
||||
_e_resist_rects(Eina_List *rects,
|
||||
int px, int py, int pw, int ph,
|
||||
int x, int y, int w, int h,
|
||||
int *rx, int *ry, int *rw, int *rh)
|
||||
int x, int y, int w, int h,
|
||||
int *rx, int *ry, int *rw, int *rh)
|
||||
{
|
||||
int dx, dy, dw, dh, d, pd;
|
||||
int resist_x = 0, resist_y = 0;
|
||||
|
|
|
@ -1127,4 +1127,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1963,4 +1963,3 @@ _e_shelf_on_current_desk(E_Shelf *es, E_Event_Zone_Edge *ev)
|
|||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -414,4 +414,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -358,4 +358,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -722,4 +722,3 @@ _e_sys_dialog_cb_delete(E_Obj_Dialog *od __UNUSED__)
|
|||
* is deleted in some other way. */
|
||||
_e_sys_dialog = NULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -387,4 +387,3 @@ get_word(char *s,
|
|||
*p2 = 0;
|
||||
return p1;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
#include "e.h"
|
||||
|
||||
typedef struct _E_Thumb E_Thumb;
|
||||
|
|
|
@ -563,4 +563,3 @@ _e_thumb_file_id(char *file,
|
|||
s[(i * 2)] = 0;
|
||||
return strdup(s);
|
||||
}
|
||||
|
||||
|
|
|
@ -292,4 +292,3 @@ e_update_shutdown(void)
|
|||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -212,4 +212,3 @@ _e_wid_button_state_send(E_Widget_Data *wd)
|
|||
edje_object_signal_emit(wd->o_button, "e,state,icon", "e");
|
||||
edje_object_message_signal_process(wd->o_button);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
#ifndef E_WIDGET_CSLIDER_H
|
||||
#define E_WIDGET_CSLIDER_H
|
||||
|
||||
Evas_Object * e_widget_cslider_add(Evas *e, E_Color_Component mode, E_Color *color, int vertical, int fixed);
|
||||
void e_widget_cslider_color_value_set(Evas_Object *obj, E_Color *ec);
|
||||
void e_widget_cslider_update(Evas_Object *obj);
|
||||
void e_widget_cslider_mode_set(Evas_Object *obj, E_Color_Component mode);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -146,8 +146,8 @@ _e_wid_reconfigure(E_Widget_Data *wd)
|
|||
}
|
||||
else
|
||||
{
|
||||
mw = tw / wd->dx;
|
||||
mh = th / wd->dy;
|
||||
mw = tw / wd->dx;
|
||||
mh = th / wd->dy;
|
||||
}
|
||||
|
||||
if (mw > tw/wd->dx)
|
||||
|
|
|
@ -762,4 +762,3 @@ _e_wid_del_hook(Evas_Object *obj)
|
|||
|
||||
free(wd);
|
||||
}
|
||||
|
||||
|
|
|
@ -71,4 +71,3 @@ _e_wid_disable_hook(Evas_Object *obj)
|
|||
else
|
||||
edje_object_signal_emit(wd->text, "e,state,enabled", "e");
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,5 @@ EAPI Evas_Object *e_widget_list_add(Evas *evas, int homogenous, int horiz);
|
|||
EAPI void e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align);
|
||||
EAPI void e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -171,4 +171,3 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, v
|
|||
if (w != vw) evas_object_resize(data, vw, h);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#ifndef E_WIDGET_SPECTRUM_H
|
||||
#define E_WIDGET_SPECTRUM_H
|
||||
|
||||
Evas_Object *e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv);
|
||||
void e_widget_spectrum_mode_set(Evas_Object *obj, E_Color_Component mode);
|
||||
void e_widget_spectrum_update(Evas_Object *obj, int redraw);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -205,4 +205,3 @@ _e_xinerama_cb_screen_sort(const void *data1, const void *data2)
|
|||
}
|
||||
return dif;
|
||||
}
|
||||
|
||||
|
|
|
@ -1826,4 +1826,3 @@ _e_zone_edge_move_resize(E_Zone *zone)
|
|||
ecore_x_window_move_resize(zone->corner.bottom_left,
|
||||
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue