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

make clang happy 

SVN revision: 45191
This commit is contained in:
Sebastian Dransfeld 2010-01-15 19:36:00 +00:00
parent c3a71f394d
commit f2c243f91e
41 changed files with 60 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/modules/battery/batget.c
View File

@ -129,40 +129,6 @@ str_get(char *buf)
return strdup(p);
}
static int
axtoi(char *arg)
{
int n, val, pwr=1, m, rc = 0;
char hex[9], c;
for (n = 0, m = 0; n < strlen(arg); n++)
{
if (arg[n] != ' ')
{
hex[m++] = c = toupper(arg[n]);
if ((m == sizeof(hex)) || (c < '0') || (c > 'F'))
return 0; /* overflow or invalid */
}
}
hex[m] = 0; /* terminate string */
for (n = 0; n < m; n++)
{
c = hex[m-n-1];
if ((c >= 'A') && (c <= 'F'))
val = c -'A' + 10;
else
val = c - '0';
rc = rc + val * pwr;
pwr *= 16;
}
return rc;
}
#ifdef __FreeBSD__
#define BATTERY_STATE_NONE 0
@ -913,9 +879,6 @@ linux_acpi_cb_acpid_del(void *data, int type, void *event)
static int
linux_acpi_cb_acpid_data(void *data, int type, void *event)
{
Ecore_Con_Event_Server_Data *ev;
ev = event;
if (delay_check) ecore_timer_del(delay_check);
delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
return 1;
@ -1292,10 +1255,8 @@ linux_pmu_check(void)
Eina_List *bats;
char *name;
int ac = 0;
int flags = 0;
int charge = 0;
int max_charge = 0;
int voltage = 0;
int seconds = 0;
int curcharge = 0;
int curmax = 0;
@ -1333,9 +1294,7 @@ linux_pmu_check(void)
if ((token = strtok(buf, ":")))
{
if (!strncmp("flags", token, 5))
flags = axtoi(strtok (0, ": "));
else if (!strncmp("charge", token, 6))
if (!strncmp("charge", token, 6))
charge = atoi(strtok(0, ": "));
else if (!strncmp("max_charge", token, 9))
max_charge = atoi(strtok(0, ": "));
@ -1343,8 +1302,6 @@ linux_pmu_check(void)
current = atoi(strtok(0, ": "));
else if (!strncmp("time rem", token, 8))
timeleft = atoi(strtok(0, ": "));
else if (!strncmp("voltage", token, 7))
voltage = atoi(strtok(0, ": "));
else
strtok(0, ": ");
}

2
src/modules/battery/e_mod_main.c
View File

@ -221,9 +221,9 @@ _battery_face_time_set(Evas_Object *battery, int time_left)
hrs = (time_left / 3600);
mins = ((time_left) / 60 - (hrs * 60));
snprintf(buf, sizeof(buf), "%i:%02i", hrs, mins);
if (hrs < 0) hrs = 0;
if (mins < 0) mins = 0;
snprintf(buf, sizeof(buf), "%i:%02i", hrs, mins);
edje_object_part_text_set(battery, "e.text.time", buf);
}

6
src/modules/conf_applications/e_int_config_apps.c
View File

@ -654,11 +654,10 @@ _save_menu(E_Config_Dialog_Data *cfdata)
menu = efreet_menu_new("Favorites");
for (i = 0, l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next, i++)
{
E_Ilist_Item *item = NULL;
Efreet_Desktop *desk = NULL;
const char *lbl;
if (!(item = l->data)) continue;
if (!l->data) continue;
lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, i);
if (!lbl) continue;
desk = efreet_util_desktop_name_find(lbl);
@ -682,11 +681,10 @@ _save_order(E_Config_Dialog_Data *cfdata)
e_order_clear(order);
for (i = 0, l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next, i++)
{
E_Ilist_Item *item = NULL;
Efreet_Desktop *desk = NULL;
const char *lbl;
if (!(item = l->data)) continue;
if (!l->data) continue;
lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, i);
if (!lbl) continue;
desk = efreet_util_desktop_name_find(lbl);

4
src/modules/conf_display/e_int_config_display.c
View File

@ -366,15 +366,12 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if ((cfdata->can_rotate) || (cfdata->can_flip))
{
int rot;
cfdata->flip = cfdata->rotation;
if (cfdata->flip_x)
cfdata->flip = (cfdata->flip | ECORE_X_RANDR_FLIP_X);
if (cfdata->flip_y)
cfdata->flip = (cfdata->flip | ECORE_X_RANDR_FLIP_Y);
rot = ecore_x_randr_screen_rotation_get(man->root);
ecore_x_randr_screen_rotation_set(man->root,
(cfdata->rotation | cfdata->flip));
cfdata->orig_rotation = cfdata->rotation;
@ -573,7 +570,6 @@ _load_resolutions(E_Config_Dialog_Data *cfdata)
{
ob = e_icon_add(evas);
e_util_icon_theme_set(ob, "dialog-ok-apply");
sel = res->id;
}
e_widget_ilist_nth_icon_set(cfdata->res_list, res->id, ob);
}

21
src/modules/conf_imc/e_int_config_imc.c
View File

@ -16,7 +16,6 @@ static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas,
/* Basic Callbacks */
static int _basic_list_sort_cb (const void *d1, const void *d2);
static void _e_imc_disable_change_cb (void *data, Evas_Object *obj);
static void _e_imc_list_change_cb (void *data, Evas_Object *obj);
static void _e_imc_setup_cb (void *data, void *data2);
@ -28,7 +27,6 @@ static void _cb_new (void *data, void *data2);
static void _cb_files_changed (void *data, Evas_Object *obj, void *event_info);
static void _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info);
static void _cb_files_files_changed (void *data, Evas_Object *obj, void *event_info);
static void _cb_files_selected (void *data, Evas_Object *obj, void *event_info);
static void _cb_files_files_deleted (void *data, Evas_Object *obj, void *event_info);
static void _e_imc_adv_setup_cb (void *data, void *data2);
@ -212,14 +210,6 @@ _basic_list_sort_cb(const void *d1, const void *d2)
return (strcmp((const char*)d1, (const char*)d2));
}
static void
_e_imc_disable_change_cb(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
}
void
_e_imc_setup_button_toggle(Evas_Object *button, E_Input_Method_Config *imc)
{
@ -583,14 +573,6 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
e_widget_change(cfdata->o_frame);
}
static void
_cb_files_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
}
static void
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
{
@ -866,8 +848,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
_cb_files_selection_change, cfdata);
evas_object_smart_callback_add(o, "selected",
_cb_files_selected, cfdata);
evas_object_smart_callback_add(o, "changed",
_cb_files_files_changed, cfdata);
evas_object_smart_callback_add(o, "files_deleted",
@ -892,7 +872,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
il = e_widget_list_add(evas, 0, 1);
o = e_widget_check_add(evas, _("Use No Input Method"), &(cfdata->imc_disable));
e_widget_on_change_hook_set(o, _e_imc_disable_change_cb, cfdata);
cfdata->gui.imc_advanced_disable = o;
e_widget_list_object_append(il, o, 1, 0, 0.5);

1
src/modules/conf_imc/e_int_config_imc_import.c
View File

@ -90,7 +90,6 @@ e_int_config_imc_import(E_Config_Dialog *parent)
evas_object_key_grab(o, "Return", mask, ~mask, 0);
mask = 0;
evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_imc_import_cb_key_down, import);

2
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -895,7 +895,7 @@ _key_binding_sort_cb(const void *d1, const void *d2)
if (i < j) return -1;
else if (i > j) return 1;
i = strcmp(bi->key, bi2->key);
i = e_util_strcmp(bi->key, bi2->key);
if (i < 0) return -1;
else if (i > 0) return 1;

6
src/modules/conf_mousebindings/e_int_config_mousebindings.c
View File

@ -1028,8 +1028,8 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata)
params = &(bw->params);
}
eina_stringshare_del(*action);
eina_stringshare_del(*params);
if (*action) eina_stringshare_del(*action);
if (*params) eina_stringshare_del(*params);
*action = NULL;
*params = NULL;
@ -1188,7 +1188,7 @@ _helper_wheel_name_get(E_Config_Binding_Wheel *bw)
static char *
_helper_modifier_name_get(int mod)
{
char mods[1024]="";
char mods[1024] = "";
if (mod & E_BINDING_MODIFIER_SHIFT)
snprintf(mods, sizeof(mods), "SHIFT");

2
src/modules/conf_profiles/e_int_config_profiles.c
View File

@ -146,7 +146,6 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
{
Evas *evas;
Eina_List *l, *profiles;
const char *cur_profile;
int selected = -1, i;
if (!cfdata) return;
@ -160,7 +159,6 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
e_widget_ilist_clear(cfdata->o_list);
e_widget_ilist_go(cfdata->o_list);
cur_profile = e_config_profile_get();
profiles = e_config_profile_list();
for (i = 0, l = profiles; l; l = l->next, i++)
{

10
src/modules/conf_startup/e_int_config_startup.c
View File

@ -104,14 +104,6 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
e_widget_change(cfdata->o_frame);
}
static void
_cb_files_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
}
static void
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
{
@ -307,8 +299,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
_cb_files_changed, cfdata);
evas_object_smart_callback_add(o, "selection_change",
_cb_files_selection_change, cfdata);
evas_object_smart_callback_add(o, "selected",
_cb_files_selected, cfdata);
evas_object_smart_callback_add(o, "changed",
_cb_files_files_changed, cfdata);
e_fm2_path_set(o, path, "/");

4
src/modules/conf_theme/e_int_config_theme.c
View File

@ -633,8 +633,8 @@ _preview_set(void *data)
ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
parts_list[i] + strlen(c_label));
if (!ret)
ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
"e/desktop/background");
e_widget_preview_edje_set(cfdata->o_preview, theme,
"e/desktop/background");
eina_stringshare_del(theme);
}
}

1
src/modules/conf_theme/e_int_config_theme_import.c
View File

@ -99,7 +99,6 @@ e_int_config_theme_import(E_Config_Dialog *parent)
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_theme_import_cb_key_down, import);

1
src/modules/conf_transitions/e_int_config_transitions.c
View File

@ -150,7 +150,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
edje_freeze();
e_widget_ilist_freeze(il);
e_widget_ilist_append(il, NULL, _("None"), _trans_cb_changed, cfdata, NULL);
l = e_theme_transition_list();
for (l = e_theme_transition_list(); l; l = l->next)
{
t = l->data;

3
src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
View File

@ -251,7 +251,6 @@ _import_config_save(Import *import)
static void
_import_edj_gen(Import *import)
{
Evas *evas;
int fd, num = 1;
const char *file;
char buf[4096], cmd[4096], tmpn[4096];
@ -259,8 +258,6 @@ _import_edj_gen(Import *import)
FILE *f;
size_t len, off;
evas = e_win_evas_get(import->dia->win);
file = import->cfdata->name;
fstrip = ecore_file_strip_ext(file);
if (!fstrip) return;

19
src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
View File

@ -71,7 +71,6 @@ struct _E_Config_Dialog_Data
int quality;
};
static void _import_opt_disabled_set(Import *import, int disabled);
static void _fsel_path_save(FSel *fsel);
static void _import_edj_gen(Import *import);
static int _import_cb_edje_cc_exit(void *data, int type, void *event);
@ -85,7 +84,6 @@ static void _fsel_cb_close(void *data, void *data2);
static void _fsel_cb_ok(void *data, void *data2);
static void _import_cb_wid_on_focus(void *data, Evas_Object *obj);
static void _import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event);
static void _fsel_cb_wid_on_focus(void *data, Evas_Object *obj);
static void _fsel_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event);
E_Win *
@ -161,7 +159,6 @@ e_int_config_wallpaper_import(void *data, const char *path)
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_import_cb_key_down, import);
@ -317,7 +314,6 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
if (!kg)
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
mask = 0;
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_fsel_cb_key_down, fsel);
@ -789,8 +785,9 @@ _fsel_cb_ok(void *data, void *data2)
win = data;
if (!(fsel = win->data)) return;
path = e_widget_fsel_selection_path_get(fsel->fsel_obj);
if (!path) return;
if (path) p = strrchr(path, '.');
p = strrchr(path, '.');
if ((!p) || (!strcasecmp(p, ".edj")))
{
int r;
@ -847,18 +844,6 @@ _import_cb_wid_on_focus(void *data, Evas_Object *obj)
e_widget_focused_object_clear(import->content_obj);
}
static void
_fsel_cb_wid_on_focus(void *data, Evas_Object *obj)
{
FSel *fsel;
fsel = data;
if (obj == fsel->content_obj)
e_widget_focused_object_clear(fsel->box_obj);
else if (fsel->content_obj)
e_widget_focused_object_clear(fsel->content_obj);
}
static void
_import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event)
{

3
src/modules/conf_wallpaper2/e_int_config_wallpaper.c
View File

@ -177,7 +177,7 @@ _e_smart_reconfigure_do(void *data)
sd->sx = it->x + (it->w / 2);
sd->sy = it->y + (it->h / 2);
}
if ((x + ww) > mw)mw = x + ww;
if ((x + ww) > mw) mw = x + ww;
if ((y + hh) > mh) mh = y + hh;
x += ww;
}
@ -274,7 +274,6 @@ _e_smart_reconfigure_do(void *data)
a = M_PI - atan(-(double)dy / (double)dx);
}
d = sqrt((double)(dx * dx) + (double)(dy * dy));
dx = dy = 0;
sum = 0;
if (it->file)

6
src/modules/dropshadow/e_mod_main.c
View File

@ -854,18 +854,14 @@ _ds_shadow_recalc(Shadow *sh)
}
else
{
int shw, shh, bsz, shx, shy;
int bsz, shx, shy;
_ds_shadow_obj_init(sh);
sh->square = 1;
shx = sh->ds->conf->shadow_x;
shy = sh->ds->conf->shadow_y;
shw = sh->w;
shh = sh->h;
bsz = sh->ds->conf->blur_size;
if (shw > ((bsz * 2) + 2)) shw = (bsz * 2) + 2;
if (shh > ((bsz * 2) + 2)) shh = (bsz * 2) + 2;
if (sh->use_shared)
{

5
src/modules/exebuf/e_exebuf.c
View File

@ -738,7 +738,7 @@ _e_exebuf_complete(void)
{
char common[EXEBUFLEN], *exe = NULL;
Eina_List *l;
int orig_len = 0, common_len = 0, exe_len, next_char, val, pos, matches;
int orig_len = 0, common_len = 0, exe_len, next_char, val, matches;
int clear_hist = 0;
if (!(strlen(cmd_buf)))
@ -778,7 +778,6 @@ _e_exebuf_complete(void)
if (exe_len > common_len)
{
val = 0;
pos = evas_string_char_next_get(exe, common_len, &val);
if (!next_char)
next_char = val;
else if (next_char != val)
@ -1008,7 +1007,7 @@ _e_exebuf_matches_update(void)
if (hist_matches)
{
_e_exebuf_hist_update(hist_matches);
hist_matches = eina_list_free(hist_matches);
eina_list_free(hist_matches);
exe_sel = eaps->data;
if (exe_sel)
{

6
src/modules/ibar/e_mod_main.c
View File

@ -743,10 +743,8 @@ _ibar_cb_menu_post(void *data, E_Menu *m)
static void
_ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_In *ev;
IBar_Icon *ic;
ev = event_info;
ic = data;
_ibar_icon_signal_emit(ic, "e,state,focused", "e");
if (ic->ibar->inst->ci->show_label)
@ -756,10 +754,8 @@ _ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
static void
_ibar_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Out *ev;
IBar_Icon *ic;
ev = event_info;
ic = data;
_ibar_icon_signal_emit(ic, "e,state,unfocused", "e");
if (ic->ibar->inst->ci->show_label)
@ -1096,10 +1092,8 @@ _ibar_inst_cb_move(void *data, const char *type, void *event_info)
static void
_ibar_inst_cb_leave(void *data, const char *type, void *event_info)
{
E_Event_Dnd_Leave *ev;
Instance *inst;
ev = event_info;
inst = data;
inst->ibar->ic_drop_before = NULL;
evas_object_del(inst->ibar->o_drop);

4
src/modules/ibox/e_mod_main.c
View File

@ -654,10 +654,8 @@ _ibox_cb_menu_post(void *data, E_Menu *m)
static void
_ibox_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_In *ev;
IBox_Icon *ic;
ev = event_info;
ic = data;
_ibox_icon_signal_emit(ic, "e,state,focused", "e");
if (ic->ibox->inst->ci->show_label)
@ -941,10 +939,8 @@ _ibox_inst_cb_move(void *data, const char *type, void *event_info)
static void
_ibox_inst_cb_leave(void *data, const char *type, void *event_info)
{
E_Event_Dnd_Leave *ev;
Instance *inst;
ev = event_info;
inst = data;
inst->ibox->ic_drop_before = NULL;
evas_object_del(inst->ibox->o_drop);

4
src/modules/illume-home/e_mod_main.c
View File

@ -71,7 +71,6 @@ static int _il_home_cb_client_message(void *data, int type, void *event);
/* local variables */
static Eina_List *instances = NULL;
static Eina_List *desks = NULL;
static Eina_List *sels = NULL;
static Eina_List *handlers = NULL;
static Eina_List *exes = NULL;
static Ecore_Timer *defer = NULL;
@ -597,7 +596,6 @@ _il_home_desks_populate(void)
if (menu)
{
Eina_List *l, *ll;
Efreet_Desktop *desktop;
char buff[PATH_MAX];
Efreet_Menu *entry, *subentry;
Eina_List *settings, *sys, *kbd;
@ -609,9 +607,9 @@ _il_home_desks_populate(void)
EINA_LIST_FOREACH(menu->entries, l, entry)
{
if (entry->type != EFREET_MENU_ENTRY_MENU) continue;
desktop = entry->desktop;
EINA_LIST_FOREACH(entry->entries, ll, subentry)
{
Efreet_Desktop *desktop;
if (subentry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
if (!(desktop = subentry->desktop)) continue;
if ((settings) && (sys) &&

3
src/modules/illume-indicator/e_mod_win.c
View File

@ -329,11 +329,10 @@ _e_mod_win_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event)
static void
_e_mod_win_cb_mouse_wheel(void *data, Evas *evas, Evas_Object *obj, void *event)
{
Il_Ind_Win *iwin;
Evas_Event_Mouse_Wheel *ev;
Ecore_X_Illume_Quickpanel_State state;
if (!(iwin = data)) return;
if (!data) return;
ev = event;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
if (ev->direction != 0) return;

10
src/modules/illume-keyboard/e_kbd_dict.c
View File

@ -201,7 +201,7 @@ _e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd, const char *p, const char *eol, in
s[eol - p] = 0;
p2 = evas_string_char_next_get(s, 0, &(glyphs[0]));
if ((p2 > 0) && (glyphs[0] > 0))
p2 = evas_string_char_next_get(s, p2, &(glyphs[1]));
evas_string_char_next_get(s, p2, &(glyphs[1]));
}
static void
@ -683,12 +683,12 @@ static void
_e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
Eina_List *more)
{
Eina_List *l, *l2, *list;
const char *p, *pn;
Eina_List *l, *list;
const char *p;
char *base, *buf, *wd, *bufapp;
E_Kbd_Dict_Letter *kl;
int len = 0, dist = 0, d, baselen, maxdist = 0, md;
static int level = 0, lv;
static int level = 0;
level++;
for (l = word; l; l = l->next)
@ -758,7 +758,7 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
if (kw)
{
int accuracy;
int w, b, w2, b2, wc, bc, upper;
int w, b, w2, b2, wc, bc;
// match any capitalisation
for (w = 0, b = 0; wd[w] && buf[b];)

4
src/modules/illume-keyboard/e_kbd_send.c
View File

@ -4,11 +4,11 @@
static const char *
_string_to_keysym(const char *str)
{
int glyph, ok;
int glyph;
/* utf8 -> glyph id (unicode - ucs4) */
glyph = 0;
ok = evas_string_char_next_get(str, 0, &glyph);
evas_string_char_next_get(str, 0, &glyph);
if (glyph <= 0) return NULL;
/* glyph id -> keysym */
if (glyph > 0xff) glyph |= 0x1000000;

3
src/modules/illume-keyboard/e_mod_config.c
View File

@ -180,9 +180,6 @@ _il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata
kbds = efreet_util_desktop_category_list("Keyboard");
EINA_LIST_FOREACH(kbds, l, desktop)
{
const char *dname;
dname = ecore_file_file_get(desktop->orig_path);
ow = e_widget_radio_add(evas, desktop->name, nn, rg);
e_widget_framelist_object_append(of, ow);
evas_object_smart_callback_add(ow, "changed",

6
src/modules/illume-softkey/e_mod_win.c
View File

@ -90,11 +90,10 @@ _il_sk_win_cb_resize(E_Win *win)
static void
_il_sk_win_cb_back_click(void *data, void *data2)
{
Il_Sk_Win *swin;
E_Border *bd, *fbd;
Eina_List *focused, *l;
if (!(swin = data)) return;
if (!data) return;
if (!(bd = e_border_focused_get())) return;
focused = e_border_focus_stack_get();
EINA_LIST_REVERSE_FOREACH(focused, l, fbd)
@ -122,10 +121,9 @@ _il_sk_win_cb_back_click(void *data, void *data2)
static void
_il_sk_win_cb_close_click(void *data, void *data2)
{
Il_Sk_Win *swin;
E_Border *bd;
if (!(swin = data)) return;
if (!data) return;
if (!(bd = e_border_focused_get())) return;
e_border_act_close_begin(bd);
}

3
src/modules/illume/e_cfg.c
View File

@ -1112,9 +1112,6 @@ _e_cfg_keyboard_ui(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdata)
kbds = efreet_util_desktop_category_list("Keyboard");
EINA_LIST_FOREACH(kbds, l, desktop)
{
const char *dname;
dname = ecore_file_file_get(desktop->orig_path);
o = e_widget_radio_add(e, desktop->name, nn, rg);
e_widget_framelist_object_append(frame, o);
evas_object_smart_callback_add(o, "changed", _e_cfg_keyboard_change, NULL);

14
src/modules/illume/e_kbd.c
View File

@ -289,16 +289,6 @@ _e_kbd_cb_client_message(void *data, int type, void *event)
return 1;
}
static int
_e_kbd_cb_border_add(void *data, int type, void *event)
{
E_Event_Border_Add *ev;
ev = event;
// nothing - border hooks do this
return 1;
}
static int
_e_kbd_cb_border_remove(void *data, int type, void *event)
{
@ -913,10 +903,6 @@ e_kbd_init(E_Module *m)
ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE,
_e_kbd_cb_client_message, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_ADD,
_e_kbd_cb_border_add, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_REMOVE,

3
src/modules/illume/e_kbd_dict.c
View File

@ -208,7 +208,7 @@ _e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd, const char *p, const char *eol,
s[eol - p] = 0;
p2 = evas_string_char_next_get(s, 0, &(glyphs[0]));
if ((p2 > 0) && (glyphs[0] > 0))
p2 = evas_string_char_next_get(s, p2, &(glyphs[1]));
evas_string_char_next_get(s, p2, &(glyphs[1]));
}
static void
@ -393,7 +393,6 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
if (cmp < 0)
{
fprintf(f, "%s %i\n", kw->word, kw->usage);
writeline = 1;
eina_stringshare_del(kw->word);
free(kw);
kd->changed.writes = eina_list_remove_list(kd->changed.writes, kd->changed.writes);

4
src/modules/illume/e_kbd_send.c
View File

@ -4,11 +4,11 @@
static const char *
_string_to_keysym(const char *str)
{
int glyph, ok;
int glyph;
/* utf8 -> glyph id (unicode - ucs4) */
glyph = 0;
ok = evas_string_char_next_get(str, 0, &glyph);
evas_string_char_next_get(str, 0, &glyph);
if (glyph <= 0) return NULL;
/* glyph id -> keysym */
if (glyph > 0xff) glyph |= 0x1000000;

3
src/modules/illume/e_mod_layout.c
View File

@ -820,9 +820,6 @@ _cb_event_border_hide(void *data, int type, void *event)
static int
_cb_event_zone_move_resize(void *data, int type, void *event)
{
E_Event_Zone_Move_Resize *ev;
ev = event;
_e_mod_layout_apply_all();
return 1;
}

8
src/modules/illume/e_mod_win.c
View File

@ -48,7 +48,6 @@ static void _cb_slipshelf_keyboard(const void *data, E_Slipshelf *ess, E_Slipshe
static void _cb_slipshelf_app_next(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipshelf_app_prev(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipwin_border_select(void *data, E_Slipwin *esw, E_Border *bd);
static void _cb_slipshelf_select(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipshelf_border_select(void *data, E_Slipshelf *ess, E_Border *bd);
static void _cb_slipshelf_border_home2(void *data, E_Slipshelf *ess, E_Border *pbd);
static void _cb_selected(void *data, Evas_Object *obj, void *event_info);
@ -700,7 +699,6 @@ static int
_cb_event_border_add(void *data, int type, void *event)
{
E_Event_Border_Add *ev;
Efreet_Desktop *desktop;
Instance *ins;
Eina_List *l;
@ -712,8 +710,6 @@ _cb_event_border_add(void *data, int type, void *event)
e_slipshelf_action_enabled_set(slipshelf, E_SLIPSHELF_ACTION_APP_NEXT, 1);
e_slipshelf_action_enabled_set(slipshelf, E_SLIPSHELF_ACTION_APP_PREV, 1);
}
desktop = e_exec_startup_id_pid_find(ev->border->client.netwm.pid,
ev->border->client.netwm.startup_id);
EINA_LIST_FOREACH(instances, l, ins)
if (!ins->border)
{
@ -1050,7 +1046,6 @@ _apps_populate(void)
{
Efreet_Menu *menu, *entry, *subentry;
Efreet_Desktop *desktop;
char *label, *icon, *plabel;
Eina_List *settings_desktops, *system_desktops, *keyboard_desktops;
Eina_List *l, *ll;
@ -1065,8 +1060,6 @@ _apps_populate(void)
{
if (entry->type != EFREET_MENU_ENTRY_MENU) continue;
desktop = entry->desktop;
plabel = NULL;
if (entry->name) plabel = strdup(entry->name);
@ -1080,6 +1073,7 @@ _apps_populate(void)
EINA_LIST_FOREACH(entry->entries, ll, subentry)
{
Efreet_Desktop *desktop;
if (subentry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
label = icon = NULL;

34
src/modules/illume/e_slipshelf.c
View File

@ -23,7 +23,6 @@ static int _e_slipshelf_cb_animate(void *data);
static void _e_slipshelf_slide(E_Slipshelf *ess, int out, double len);
static int _e_slipshelf_cb_mouse_up(void *data, int type, void *event);
static int _e_slipshelf_cb_zone_move_resize(void *data, int type, void *event);
static int _e_slipshelf_cb_zone_del(void *data, int type, void *event);
static void _e_slipshelf_event_simple_free(void *data, void *ev);
static void _e_slipshelf_object_del_attach(void *o);
static int _e_slipshelf_cb_border_focus_in(void *data, int type, void *event);
@ -31,7 +30,6 @@ static int _e_slipshelf_cb_border_focus_out(void *data, int type, void *event);
static int _e_slipshelf_cb_border_property(void *data, int type, void *event);
static void _e_slipshelf_title_update(E_Slipshelf *ess);
static void _e_slipshelf_cb_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
static void _e_slipshelf_cb_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
static Evas_Object *_e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
static void _e_winilist_cb_item_sel(void *data, void *data2);
@ -54,8 +52,6 @@ e_slipshelf_init(void)
EAPI int
e_slipshelf_shutdown(void)
{
E_Config_Dialog *cfd;
e_winilist_shutdown();
return 1;
}
@ -64,7 +60,7 @@ EAPI E_Slipshelf *
e_slipshelf_new(E_Zone *zone, const char *themedir)
{
E_Slipshelf *ess;
Evas_Coord mw, mh, vx, vy, vw, vh, w, h;
Evas_Coord mw, mh, vx, vy, vw, vh;
int x, y;
Evas_Object *o;
@ -143,7 +139,6 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
edje_object_part_swallow(ess->base_obj, "e.swallow.extra", ess->gadcon_extra->o_container);
e_gadcon_min_size_request_callback_set(ess->gadcon_extra, _e_slipshelf_cb_gadcon_min_size_request, ess);
e_gadcon_size_request_callback_set(ess->gadcon_extra, _e_slipshelf_cb_gadcon_size_request, ess);
e_gadcon_frame_request_callback_set(ess->gadcon_extra, _e_slipshelf_cb_gadcon_frame_request, ess);
e_gadcon_orient(ess->gadcon_extra, E_GADCON_ORIENT_TOP);
e_gadcon_zone_set(ess->gadcon_extra, ess->zone);
@ -156,7 +151,6 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
edje_object_part_swallow(ess->base_obj, "e.swallow.content", ess->gadcon->o_container);
e_gadcon_min_size_request_callback_set(ess->gadcon, _e_slipshelf_cb_gadcon_min_size_request, ess);
e_gadcon_size_request_callback_set(ess->gadcon, _e_slipshelf_cb_gadcon_size_request, ess);
e_gadcon_frame_request_callback_set(ess->gadcon, _e_slipshelf_cb_gadcon_frame_request, ess);
e_gadcon_orient(ess->gadcon, E_GADCON_ORIENT_TOP);
e_gadcon_zone_set(ess->gadcon, ess->zone);
@ -608,14 +602,9 @@ _e_slipshelf_cb_item_sel(void *data, E_Border *bd)
static void
_e_slipshelf_applist_update(E_Slipshelf *ess)
{
Evas_Coord mw, mh, vx, vy, vw, vh, w, h, sfmw, sfmh, cmw, cmh, smw, smh;
int i, selnum, x, y;
int pw, ph;
Evas_Coord vx, vy, vw, vh, sfmw, sfmh, cmw, cmh, smw, smh;
int x, y;
i = 0;
pw = ess->popup->w;
ph = ess->popup->h;
ess->bsel = e_border_focused_get();
e_winilist_optimial_size_get(ess->scrollframe_obj, &sfmw, &sfmh);
@ -798,7 +787,6 @@ static void
_e_slipshelf_object_del_attach(void *o)
{
E_Slipshelf *ess;
E_Event_Slipshelf_Del *ev;
if (e_object_is_del(E_OBJECT(o))) return;
ess = o;
@ -819,7 +807,8 @@ _e_slipshelf_cb_border_focus_in(void *data, int type, void *event)
ev = event;
ess = data;
ess->focused_border = ev->border;
_e_slipshelf_title_update(ess);
_e_slipshelf_title_update(ess);
return 1;
}
static int
@ -832,7 +821,8 @@ _e_slipshelf_cb_border_focus_out(void *data, int type, void *event)
ess = data;
if (ess->focused_border == ev->border)
ess->focused_border = NULL;
_e_slipshelf_title_update(ess);
_e_slipshelf_title_update(ess);
return 1;
}
static int
@ -845,6 +835,7 @@ _e_slipshelf_cb_border_property(void *data, int type, void *event)
ess = data;
if (ess->focused_border == ev->border)
_e_slipshelf_title_update(ess);
return 1;
}
static void
@ -906,15 +897,6 @@ _e_slipshelf_cb_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w,
return;
}
static void
_e_slipshelf_cb_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
{
E_Slipshelf *ess;
ess = data;
return;
}
static Evas_Object *
_e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style)
{

56
src/modules/illume/e_winilist.c
View File

@ -417,86 +417,54 @@ _refill(Data *d)
static int
_cb_border_add(void *data, int ev_type, void *event)
{
E_Event_Border_Add *ev;
ev = event;
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}
static int
_cb_border_remove(void *data, int ev_type, void *event)
{
E_Event_Border_Remove *ev;
ev = event;
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}
static int
_cb_border_show(void *data, int ev_type, void *event)
{
E_Event_Border_Show *ev;
ev = event;
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}
static int
_cb_border_hide(void *data, int ev_type, void *event)
{
E_Event_Border_Hide *ev;
ev = event;
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}
static int
_cb_border_property(void *data, int ev_type, void *event)
{
E_Event_Border_Property *ev;
ev = event;
/* FIXME: should really be optimal on what properties warrant a refill */
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}
static int
_cb_desk_show(void *data, int ev_type, void *event)
{
E_Event_Desk_Show *ev;
ev = event;
/* FIXME: should really be optimal on what properties warrant a refill */
{
Eina_List *l;
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
}
for (l = winilists; l; l = l->next) _refill(l->data);
return 1;
}

5
src/modules/illume2/e_kbd_dbus.c
View File

@ -226,12 +226,11 @@ _e_kbd_dbus_dev_add(void *data, DBusMessage *msg)
{
DBusError err;
char *udi;
int ret;
dbus_error_init(&err);
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
ret = e_hal_device_query_capability(dbus_conn, udi, "input.keyboard",
_e_kbd_dbus_cb_input_kbd_is, udi);
e_hal_device_query_capability(dbus_conn, udi, "input.keyboard",
_e_kbd_dbus_cb_input_kbd_is, udi);
}
static void

30
src/modules/pager/e_mod_main.c
View File

@ -126,8 +126,6 @@ static int _pager_cb_event_zone_desk_count_set(void *data, int type, void *event
static int _pager_cb_event_desk_show(void *data, int type, void *event);
static int _pager_cb_event_desk_name_change(void *data, int type, void *event);
static int _pager_cb_event_container_resize(void *data, int type, void *event);
static void _pager_window_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _pager_window_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _pager_window_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _pager_window_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
@ -606,10 +604,6 @@ _pager_window_new(Pager_Desk *pd, E_Border *border)
e_layout_pack(pd->o_layout, pw->o_window);
e_layout_child_raise(pw->o_window);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
_pager_window_cb_mouse_in, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
_pager_window_cb_mouse_out, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_pager_window_cb_mouse_down, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
@ -1728,28 +1722,6 @@ _pager_cb_event_container_resize(void *data, int type, void *event)
return 1;
}
static void
_pager_window_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_In *ev;
Pager_Win *pw;
ev = event_info;
pw = data;
/* FIXME: display window title in some tooltip thing */
}
static void
_pager_window_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Out *ev;
Pager_Win *pw;
ev = event_info;
pw = data;
/* FIXME: close tooltip */
}
static void
_pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
@ -2059,11 +2031,9 @@ _pager_drop_cb_move(void *data, const char *type, void *event_info)
static void
_pager_drop_cb_leave(void *data, const char *type, void *event_info)
{
E_Event_Dnd_Leave *ev;
Pager *p;
Eina_List *l;
ev = event_info;
p = data;
if (act_popup) p = act_popup->pager;

1
src/modules/start/e_mod_main.c
View File

@ -162,7 +162,6 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
e_menu_post_deactivate_callback_set(inst->main_menu,
_menu_cb_post,
inst);
dir = E_MENU_POP_DIRECTION_AUTO;
switch (inst->gcc->gadcon->orient)
{
case E_GADCON_ORIENT_TOP:

3
src/modules/temperature/e_mod_main.c
View File

@ -134,9 +134,6 @@ _gc_shutdown(E_Gadcon_Client *gcc)
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{
Config_Face *inst;
inst = gcc->data;
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}

8
src/modules/temperature/tempget.c
View File

@ -105,11 +105,11 @@ init(void)
sensor_type = SENSOR_TYPE_LINUX_ACPI;
sensor_name = strdup(name);
therms = eina_list_free(therms);
eina_list_free(therms);
}
else
{
therms = eina_list_free(therms);
eina_list_free(therms);
if (ecore_file_exists("/proc/omnibook/temperature"))
{
sensor_type = SENSOR_TYPE_OMNIBOOK;
@ -157,7 +157,7 @@ init(void)
sensor_path, sensor_name);
}
}
therms = eina_list_free(therms);
eina_list_free(therms);
}
if (!sensor_path)
{
@ -186,7 +186,7 @@ init(void)
sensor_path, sensor_name);
}
}
therms = eina_list_free(therms);
eina_list_free(therms);
}
}
}

4
src/modules/winlist/e_winlist.c
View File

@ -800,7 +800,7 @@ _e_winlist_cb_key_down(void *data, int type, void *event)
{
bind = l->data;
if (bind->action && strcmp(bind->action,"winlist")) continue;
if (bind->action && strcmp(bind->action, "winlist")) continue;
mod = 0;
@ -816,7 +816,7 @@ _e_winlist_cb_key_down(void *data, int type, void *event)
if (bind->key && (!strcmp(bind->key, ev->keyname)) &&
((bind->modifiers == mod) || (bind->any_mod)))
{
if (!(act = e_action_find(bind->action)));
if (!(act = e_action_find(bind->action))) continue;
if (act->func.go_key)
act->func.go_key(E_OBJECT(winlist->zone), bind->params, ev);
else if (act->func.go)

5
src/modules/wizard/e_wizard.c
View File

@ -240,7 +240,7 @@ static E_Popup *
_e_wizard_main_new(E_Zone *zone)
{
E_Popup *pop;
Evas_Object *o, *o_ev;
Evas_Object *o;
Evas_Modifier_Mask mask;
Eina_Bool kg;
@ -275,7 +275,6 @@ _e_wizard_main_new(E_Zone *zone)
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
_e_wizard_cb_key_down, pop);
o_ev = o;
/* set up next/prev buttons */
edje_object_part_text_set(o_bg, "e.text.title", _("Welcome to Enlightenment"));
@ -315,10 +314,8 @@ static void
_e_wizard_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event)
{
Evas_Event_Key_Down *ev;
E_Popup *pop;
ev = event;
pop = (E_Popup *)data;
if (!o_content) return;
if (!strcmp(ev->keyname, "Tab"))
{