e/src/modules:

- cast ints to pointer correctly
- remove unused variables
- #if 0 unusued code
- fix some function declarations for callbacks 


SVN revision: 42210
This commit is contained in:
Hannes Janetzek 2009-09-03 16:32:48 +00:00
parent dff8cab47b
commit a551323a28
29 changed files with 79 additions and 68 deletions

View File

@ -411,9 +411,12 @@ darwin_check(void)
/***---***/ /***---***/
/* new linux power class api to get power info - brand new and this code /* new linux power class api to get power info - brand new and this code
* may have bugs, but it is a good attempt to get it right */ * may have bugs, but it is a good attempt to get it right */
#if 0
static int linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler); static int linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
static void linux_sys_class_power_supply_init(void);
static void linux_sys_class_power_supply_check(void); static void linux_sys_class_power_supply_check(void);
#endif
static void linux_sys_class_power_supply_init(void);
typedef struct _Sys_Class_Power_Supply_Uevent Sys_Class_Power_Supply_Uevent; typedef struct _Sys_Class_Power_Supply_Uevent Sys_Class_Power_Supply_Uevent;
#define BASIS_CHARGE 1 #define BASIS_CHARGE 1
@ -437,6 +440,8 @@ struct _Sys_Class_Power_Supply_Uevent
}; };
static Eina_List *events = NULL; static Eina_List *events = NULL;
#if 0
static Ecore_Timer *sys_class_delay_check = NULL; static Ecore_Timer *sys_class_delay_check = NULL;
static int static int
@ -517,7 +522,7 @@ linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd
} }
return 1; return 1;
} }
#endif
static void static void
linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev) linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev)
{ {
@ -645,7 +650,7 @@ linux_sys_class_power_supply_init(void)
{ {
Eina_List *bats; Eina_List *bats;
char *name; char *name;
char buf[4096]; // char buf[4096];
bats = ecore_file_ls("/sys/class/power_supply/"); bats = ecore_file_ls("/sys/class/power_supply/");
if (bats) if (bats)

View File

@ -127,7 +127,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static Evas_Object * static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ob, *of, *otb; Evas_Object *o, *ob, *otb;
E_Radio_Group *rg; E_Radio_Group *rg;
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale); otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);

View File

@ -66,7 +66,7 @@ e_configure_show(E_Container *con)
E_Configure *eco; E_Configure *eco;
E_Manager *man; E_Manager *man;
Evas_Coord ew, eh, mw, mh; Evas_Coord ew, eh, mw, mh;
Evas_Object *o, *of; Evas_Object *o;
Evas_Modifier_Mask mask; Evas_Modifier_Mask mask;
Eina_Bool kg; Eina_Bool kg;

View File

@ -27,7 +27,7 @@ static Eina_List *_load_menu(const char *path);
static Eina_List *_load_order(const char *path); static Eina_List *_load_order(const char *path);
static void _fill_apps(E_Config_Dialog_Data *cfdata); static void _fill_apps(E_Config_Dialog_Data *cfdata);
static void _fill_list(E_Config_Dialog_Data *cfdata); static void _fill_list(E_Config_Dialog_Data *cfdata);
static int _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2); static int _cb_sort_desks(const void *d1, const void *d2);
static void _all_list_cb_change(void *data, Evas_Object *obj); static void _all_list_cb_change(void *data, Evas_Object *obj);
static void _sel_list_cb_change(void *data, Evas_Object *obj); static void _sel_list_cb_change(void *data, Evas_Object *obj);
static void _all_list_cb_selected(void *data); static void _all_list_cb_selected(void *data);
@ -418,8 +418,11 @@ _fill_list(E_Config_Dialog_Data *cfdata)
} }
static int static int
_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2) _cb_sort_desks(const void *data1, const void *data2)
{ {
const Efreet_Desktop *d1 = data1;
const Efreet_Desktop *d2 = data2;
if (!d1->name) return 1; if (!d1->name) return 1;
if (!d2->name) return -1; if (!d2->name) return -1;
return strcmp(d1->name, d2->name); return strcmp(d1->name, d2->name);

View File

@ -281,7 +281,6 @@ _create_data(E_Config_Dialog *cfd)
static void static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
Eina_List *l, *ll;
Resolution *r; Resolution *r;
if (cfdata->surebox) if (cfdata->surebox)

View File

@ -1287,6 +1287,8 @@ _edge_binding_text_get(E_Zone_Edge edge, float delay, int mod)
case E_ZONE_EDGE_BOTTOM_LEFT: case E_ZONE_EDGE_BOTTOM_LEFT:
strcat(b, "Bottom Left Edge"); strcat(b, "Bottom Left Edge");
break; break;
default:
break;
} }
} }

View File

@ -315,7 +315,6 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
E_Font_Size_Data *size_data; E_Font_Size_Data *size_data;
CFText_Class *tc; CFText_Class *tc;
Eina_List *l;
e_font_available_hash_free(cfdata->font_hash); e_font_available_hash_free(cfdata->font_hash);
cfdata->font_list =eina_list_free(cfdata->font_list); cfdata->font_list =eina_list_free(cfdata->font_list);

View File

@ -7,7 +7,6 @@ static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_D
static void _ilist_fill(E_Config_Dialog_Data *cfdata); static void _ilist_fill(E_Config_Dialog_Data *cfdata);
static void _ilist_cb_selected(void *data); static void _ilist_cb_selected(void *data);
static void _cb_add(void *data, void *data2); static void _cb_add(void *data, void *data2);
static void _cb_select(void *data, void *data2);
static void _cb_delete(void *data, void *data2); static void _cb_delete(void *data, void *data2);
static void _cb_reset(void *data, void *data2); static void _cb_reset(void *data, void *data2);
static void _cb_dialog_yes(void *data); static void _cb_dialog_yes(void *data);

View File

@ -187,6 +187,8 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
if (cfdata->o_fm) e_widget_change(cfdata->o_fm); if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
} }
#if 0
/* FIXME unused */
static void static void
_cb_files_selected(void *data, Evas_Object *obj, void *event_info) _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
{ {
@ -194,6 +196,7 @@ _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
cfdata = data; cfdata = data;
} }
#endif
static void static void
_cb_files_files_changed(void *data, Evas_Object *obj, void *event_info) _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
@ -287,10 +290,10 @@ _cb_import(void *data1, void *data2)
cfdata->win_import = e_int_config_theme_import(cfdata->cfd); cfdata->win_import = e_int_config_theme_import(cfdata->cfd);
} }
#ifdef HAVE_EXCHANGE
static void static void
_cb_web(void *data1, void *data2) _cb_web(void *data1, void *data2)
{ {
#ifdef HAVE_EXCHANGE
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = data1; cfdata = data1;
@ -298,8 +301,8 @@ _cb_web(void *data1, void *data2)
e_win_raise(cfdata->dia_web->win); e_win_raise(cfdata->dia_web->win);
else else
cfdata->dia_web = e_int_config_theme_web(cfdata->cfd); cfdata->dia_web = e_int_config_theme_web(cfdata->cfd);
#endif
} }
#endif
static void static void
_fill_data(E_Config_Dialog_Data *cfdata) _fill_data(E_Config_Dialog_Data *cfdata)
@ -540,7 +543,6 @@ _get_theme_categories_list(void)
*/ */
EINA_LIST_FOREACH(e_theme_category_list(), g, c) EINA_LIST_FOREACH(e_theme_category_list(), g, c)
{ {
const char *result;
int res; int res;
if (!c) continue; if (!c) continue;

View File

@ -136,7 +136,7 @@ _e_smart_reconfigure_do(void *data)
Item *it; Item *it;
int iw, redo = 0, changed = 0; int iw, redo = 0, changed = 0;
static int recursion = 0; static int recursion = 0;
Evas_Coord x, y, xx, yy, ww, hh, cw, ch, mw, mh, ox, oy, dd; Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox, oy, dd;
if (!sd) return 0; if (!sd) return 0;
if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w; if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
@ -235,7 +235,7 @@ _e_smart_reconfigure_do(void *data)
*/ */
) )
{ {
double a, d, di; double a, d;
int sum = 0; int sum = 0;
char *p; char *p;
@ -249,7 +249,7 @@ _e_smart_reconfigure_do(void *data)
if (dy < 0) if (dy < 0)
a = -atan(-(double)dy / (double)dx); a = -atan(-(double)dy / (double)dx);
// +-- // +--
// |\ /* |\ */
else else
a = atan((double)dy / (double)dx); a = atan((double)dy / (double)dx);
} }
@ -484,35 +484,35 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
static void static void
_e_smart_show(Evas_Object *obj) _e_smart_show(Evas_Object *obj)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
// evas_object_show(sd->child_obj); // evas_object_show(sd->child_obj);
} }
static void static void
_e_smart_hide(Evas_Object *obj) _e_smart_hide(Evas_Object *obj)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
// evas_object_hide(sd->child_obj); // evas_object_hide(sd->child_obj);
} }
static void static void
_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a) _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
// evas_object_color_set(sd->child_obj, r, g, b, a); // evas_object_color_set(sd->child_obj, r, g, b, a);
} }
static void static void
_e_smart_clip_set(Evas_Object *obj, Evas_Object * clip) _e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
// evas_object_clip_set(sd->child_obj, clip); // evas_object_clip_set(sd->child_obj, clip);
} }
static void static void
_e_smart_clip_unset(Evas_Object *obj) _e_smart_clip_unset(Evas_Object *obj)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
// evas_object_clip_unset(sd->child_obj); // evas_object_clip_unset(sd->child_obj);
} }
@ -632,7 +632,7 @@ _sel_timer(void *data)
static void static void
_pan_unhilight(Evas_Object *obj, Item *it) _pan_unhilight(Evas_Object *obj, Item *it)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); // Smart_Data *sd = evas_object_smart_data_get(obj);
if (!it->hilighted) return; if (!it->hilighted) return;
it->hilighted = 0; it->hilighted = 0;
if (it->frame) if (it->frame)
@ -739,7 +739,7 @@ _pan_sel_up(Evas_Object *obj)
static int static int
_sort_cb(const void *d1, const void *d2) _sort_cb(const void *d1, const void *d2)
{ {
Item *it1 = d1, *it2 = d2; const Item *it1 = d1, *it2 = d2;
if ((!it1->sort_id) || (!it2->sort_id)) return 0; if ((!it1->sort_id) || (!it2->sort_id)) return 0;
return strcmp(it1->sort_id, it2->sort_id); return strcmp(it1->sort_id, it2->sort_id);
} }
@ -750,7 +750,6 @@ _item_sort(Item *it)
Evas_Object *obj = it->obj; Evas_Object *obj = it->obj;
Smart_Data *sd = evas_object_smart_data_get(obj); Smart_Data *sd = evas_object_smart_data_get(obj);
int num, dosort = 0; int num, dosort = 0;
Eina_List *l;
sd->id_num++; sd->id_num++;
sd->info->scans--; sd->info->scans--;
@ -819,8 +818,8 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
static void static void
_item_down(void *data, Evas *e, Evas_Object *obj, void *event_info) _item_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{ {
Evas_Event_Mouse_Down *ev = event_info; // Evas_Event_Mouse_Down *ev = event_info;
Item *it = data; // Item *it = data;
// _pan_sel(it->obj, it); // _pan_sel(it->obj, it);
} }
@ -1031,7 +1030,7 @@ static int
_idler(void *data) _idler(void *data)
{ {
struct dirent *dp; struct dirent *dp;
char buf[PATH_MAX], *p; char buf[PATH_MAX];
Info *info = data; Info *info = data;
if (!info->dir) if (!info->dir)
@ -1288,7 +1287,7 @@ wp_broser_free(Info *info)
info = NULL; info = NULL;
} }
void E_Config_Dialog *
wp_conf_show(E_Container *con, const char *params __UNUSED__) wp_conf_show(E_Container *con, const char *params __UNUSED__)
{ {
if (global_info) if (global_info)
@ -1297,6 +1296,8 @@ wp_conf_show(E_Container *con, const char *params __UNUSED__)
e_win_raise(global_info->win); e_win_raise(global_info->win);
} }
global_info = wp_browser_new(con); global_info = wp_browser_new(con);
return NULL;
} }
void void

View File

@ -7,7 +7,7 @@
#ifndef E_INT_CONFIG_WALLPAPER_H #ifndef E_INT_CONFIG_WALLPAPER_H
#define E_INT_CONFIG_WALLPAPER_H #define E_INT_CONFIG_WALLPAPER_H
void wp_conf_show(E_Container *con, const char *params); E_Config_Dialog *wp_conf_show(E_Container *con, const char *params);
void wp_conf_hide(void); void wp_conf_hide(void);
#endif #endif

View File

@ -13,7 +13,7 @@ static void _e_mod_menu_add(void *data, E_Menu *m);
static E_Module *conf_module = NULL; static E_Module *conf_module = NULL;
static E_Int_Menu_Augmentation *maug = NULL; static E_Int_Menu_Augmentation *maug = NULL;
static E_Fm2_Mime_Handler *import_hdl = NULL; //static E_Fm2_Mime_Handler *import_hdl = NULL;
/* module setup */ /* module setup */
EAPI E_Module_Api e_modapi = EAPI E_Module_Api e_modapi =
@ -26,7 +26,7 @@ EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance"); e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper",wp_conf_show); e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper", wp_conf_show);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
// e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk); // e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
maug = e_int_menus_menu_augmentation_add_sorted maug = e_int_menus_menu_augmentation_add_sorted
@ -49,7 +49,7 @@ e_modapi_init(E_Module *m)
EAPI int EAPI int
e_modapi_shutdown(E_Module *m) e_modapi_shutdown(E_Module *m)
{ {
E_Config_Dialog *cfd; // E_Config_Dialog *cfd;
/* remove module-supplied menu additions */ /* remove module-supplied menu additions */
if (maug) if (maug)
{ {

View File

@ -6,7 +6,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _cb_disable_check(void *data, Evas_Object *obj); //static void _cb_disable_check(void *data, Evas_Object *obj);
static void _cb_enable_check(void *data, Evas_Object *obj); static void _cb_enable_check(void *data, Evas_Object *obj);
static void _cb_disable_check_list(void *data, Evas_Object *obj); static void _cb_disable_check_list(void *data, Evas_Object *obj);
@ -321,12 +321,15 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
* @param data A Evas_Object to chain together with the checkbox * @param data A Evas_Object to chain together with the checkbox
* @param obj A Evas_Object checkbox created with e_widget_check_add() * @param obj A Evas_Object checkbox created with e_widget_check_add()
*/ */
#if 0
/* FIXME unused */
static void static void
_cb_disable_check(void *data, Evas_Object *obj) _cb_disable_check(void *data, Evas_Object *obj)
{ {
e_widget_disabled_set((Evas_Object *) data, e_widget_disabled_set((Evas_Object *) data,
!e_widget_check_checked_get(obj)); !e_widget_check_checked_get(obj));
} }
#endif
/*! /*!
* If the check is disabled then enable the chained object. * If the check is disabled then enable the chained object.

View File

@ -293,7 +293,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{ {
int frequency; int frequency;
frequency = (int)l->data; frequency = (long)l->data;
mi = e_menu_item_new(mn); mi = e_menu_item_new(mn);
if (frequency < 1000000) if (frequency < 1000000)
snprintf(buf, sizeof(buf), _("%i MHz"), frequency / 1000); snprintf(buf, sizeof(buf), _("%i MHz"), frequency / 1000);
@ -502,8 +502,8 @@ _cpufreq_cb_sort(const void *item1, const void *item2)
{ {
int a, b; int a, b;
a = (int)item1; a = (long)item1;
b = (int)item2; b = (long)item2;
if (a < b) return -1; if (a < b) return -1;
else if (a > b) return 1; else if (a > b) return 1;
return 0; return 0;
@ -579,7 +579,7 @@ _cpufreq_status_check_available(Status *s)
if (atoi(freq) != 0) if (atoi(freq) != 0)
{ {
s->frequencies = eina_list_append(s->frequencies, s->frequencies = eina_list_append(s->frequencies,
(void *) atoi(freq)); (void *) (long)atoi(freq));
} }
freq = strtok(NULL, " "); freq = strtok(NULL, " ");
} }
@ -719,7 +719,7 @@ _cpufreq_face_update_available(Instance *inst)
frequency_msg = malloc(sizeof(Edje_Message_Int_Set) + (count - 1) * sizeof(int)); frequency_msg = malloc(sizeof(Edje_Message_Int_Set) + (count - 1) * sizeof(int));
frequency_msg->count = count; frequency_msg->count = count;
for (l = cpufreq_config->status->frequencies, i = 0; l; l = l->next, i++) for (l = cpufreq_config->status->frequencies, i = 0; l; l = l->next, i++)
frequency_msg->val[i] = (int)l->data; frequency_msg->val[i] = (long)l->data;
edje_object_message_send(inst->o_cpu, EDJE_MESSAGE_INT_SET, 1, frequency_msg); edje_object_message_send(inst->o_cpu, EDJE_MESSAGE_INT_SET, 1, frequency_msg);
free(frequency_msg); free(frequency_msg);
@ -764,16 +764,16 @@ _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emissio
for (l = cpufreq_config->status->frequencies; l; l = l->next) for (l = cpufreq_config->status->frequencies; l; l = l->next)
{ {
if (cpufreq_config->status->cur_frequency == (int)l->data) if (cpufreq_config->status->cur_frequency == (long)l->data)
{ {
if (!strcmp(emission, "e,action,frequency,increase")) if (!strcmp(emission, "e,action,frequency,increase"))
{ {
if (l->next) next_frequency = (int)l->next->data; if (l->next) next_frequency = (long)l->next->data;
break; break;
} }
else if (!strcmp(emission, "e,action,frequency,decrease")) else if (!strcmp(emission, "e,action,frequency,decrease"))
{ {
if (l->prev) next_frequency = (int)l->prev->data; if (l->prev) next_frequency = (long)l->prev->data;
break; break;
} }
else else
@ -963,7 +963,7 @@ _cpufreq_menu_frequency(void * data, E_Menu *m, E_Menu_Item *mi)
{ {
int frequency; int frequency;
frequency = (int)data; frequency = (long)data;
if (frequency > 0) _cpufreq_set_frequency(frequency); if (frequency > 0) _cpufreq_set_frequency(frequency);
} }

View File

@ -826,6 +826,8 @@ _e_exebuf_backspace(void)
} }
} }
/* unused */
#if 0
static void static void
_e_exebuf_delete(void) _e_exebuf_delete(void)
{ {
@ -923,6 +925,7 @@ _e_exebuf_delete(void)
} }
} }
} }
#endif
static void static void
_e_exebuf_clear(void) _e_exebuf_clear(void)

View File

@ -2290,7 +2290,7 @@ _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
// add abort button callback with id of operation in registry // add abort button callback with id of operation in registry
edje_object_signal_callback_add(o, "e,fm,operation,abort", "", edje_object_signal_callback_add(o, "e,fm,operation,abort", "",
_e_fwin_op_registry_abort_cb, (void*)ere->id); _e_fwin_op_registry_abort_cb, (void*)(long)ere->id);
//Listen to progress changes //Listen to progress changes
e_fm2_op_registry_entry_listener_add(ere, _e_fwin_op_registry_listener_cb, e_fm2_op_registry_entry_listener_add(ere, _e_fwin_op_registry_listener_cb,
@ -2316,7 +2316,7 @@ _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission,
{ {
int id; int id;
id = (int)data; id = (long)data;
if (!id) return; if (!id) return;
e_fm2_operation_abort(id); e_fm2_operation_abort(id);

View File

@ -189,7 +189,7 @@ _opinfo_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission,
{ {
int id; int id;
id = (int)data; id = (long)data;
if (!id) return; if (!id) return;
e_fm2_operation_abort(id); e_fm2_operation_abort(id);
@ -221,7 +221,7 @@ _opinfo_op_registry_detailed_cb(void *data, Evas_Object *obj, const char *emissi
static void static void
_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emission, const char *source) _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
int id = (int)data; int id = (long)data;
E_Fm2_Op_Registry_Entry *ere; E_Fm2_Op_Registry_Entry *ere;
E_Win *win; E_Win *win;
@ -257,7 +257,6 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
E_Fm2_Op_Registry_Entry *ere = event; E_Fm2_Op_Registry_Entry *ere = event;
Instance *inst = data; Instance *inst = data;
Evas_Object *o; Evas_Object *o;
int mw, mh, xh;
if (!inst || !ere) if (!inst || !ere)
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -277,13 +276,13 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
_opinfo_op_registry_summary_cb(inst, o, NULL, NULL); _opinfo_op_registry_summary_cb(inst, o, NULL, NULL);
edje_object_signal_callback_add(o, "e,fm,operation,abort", "", edje_object_signal_callback_add(o, "e,fm,operation,abort", "",
_opinfo_op_registry_abort_cb, (void*)ere->id); _opinfo_op_registry_abort_cb, (void*)(long)ere->id);
edje_object_signal_callback_add(o, "state,request,summary", "fileman_opinfo", edje_object_signal_callback_add(o, "state,request,summary", "fileman_opinfo",
_opinfo_op_registry_summary_cb, inst); _opinfo_op_registry_summary_cb, inst);
edje_object_signal_callback_add(o, "state,request,detailed", "fileman_opinfo", edje_object_signal_callback_add(o, "state,request,detailed", "fileman_opinfo",
_opinfo_op_registry_detailed_cb, inst); _opinfo_op_registry_detailed_cb, inst);
edje_object_signal_callback_add(o, "e,fm,window,jump", "", edje_object_signal_callback_add(o, "e,fm,window,jump", "",
_opinfo_op_registry_window_jump_cb, (void*)ere->id); _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id);
e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener, e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener,
o, _opinfo_op_registry_free_data); o, _opinfo_op_registry_free_data);

View File

@ -128,7 +128,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
static int static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
gadman_gadget_edit_end(); gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
e_config_save_queue(); e_config_save_queue();
return 1; return 1;
} }

View File

@ -303,7 +303,7 @@ gadman_gadget_edit_start(E_Gadcon_Client *gcc)
} }
void void
gadman_gadget_edit_end(void) gadman_gadget_edit_end(void *data, Evas_Object *obj, const char *emission, const char *source)
{ {
unsigned int layer; unsigned int layer;
@ -1053,7 +1053,7 @@ on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
gcc = data; gcc = data;
if (gcc->gadcon->editing) gadman_gadget_edit_end(); if (gcc->gadcon->editing) gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
current = gcc; current = gcc;

View File

@ -77,7 +77,7 @@ E_Gadcon_Client *gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer
void gadman_gadget_del(E_Gadcon_Client *gcc); void gadman_gadget_del(E_Gadcon_Client *gcc);
E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone); E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone);
void gadman_gadget_edit_start(E_Gadcon_Client *gcc); void gadman_gadget_edit_start(E_Gadcon_Client *gcc);
void gadman_gadget_edit_end(void); void gadman_gadget_edit_end(void *data, Evas_Object *obj, const char *emission, const char *source);
void gadman_gadgets_toggle(void); void gadman_gadgets_toggle(void);
void gadman_update_bg(void); void gadman_update_bg(void);
E_Gadcon *gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer); E_Gadcon *gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer);

View File

@ -24,11 +24,10 @@ static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _cb_disable_check(void *data, Evas_Object *obj);
static void _cb_disable_check_list(void *data, Evas_Object *obj); static void _cb_disable_check_list(void *data, Evas_Object *obj);
static void _cb_zone_policy_change(void *data, Evas_Object *obj); static void _cb_zone_policy_change(void *data, Evas_Object *obj);
// unused
//static void _cb_disable_check(void *data, Evas_Object *obj);
void void
_config_ibox_module(Config_Item *ci) _config_ibox_module(Config_Item *ci)
{ {
@ -223,13 +222,14 @@ _cb_zone_policy_change(void *data, Evas_Object *obj)
* @param data A Evas_Object to chain together with the checkbox * @param data A Evas_Object to chain together with the checkbox
* @param obj A Evas_Object checkbox created with e_widget_check_add() * @param obj A Evas_Object checkbox created with e_widget_check_add()
*/ */
#if 0
static void static void
_cb_disable_check(void *data, Evas_Object *obj) _cb_disable_check(void *data, Evas_Object *obj)
{ {
e_widget_disabled_set((Evas_Object *) data, e_widget_disabled_set((Evas_Object *) data,
!e_widget_check_checked_get(obj)); !e_widget_check_checked_get(obj));
} }
#endif
/*! /*!
* @param data A Eina_List of Evas_Object to chain widgets together with the checkbox * @param data A Eina_List of Evas_Object to chain widgets together with the checkbox
* @param obj A Evas_Object checkbox created with e_widget_check_add() * @param obj A Evas_Object checkbox created with e_widget_check_add()

View File

@ -764,12 +764,11 @@ _e_kbd_dbus_cb_dev_add(void *data, DBusMessage *msg)
{ {
DBusError err; DBusError err;
char *udi; char *udi;
int ret;
dbus_error_init(&err); dbus_error_init(&err);
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID); dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
udi = strdup(udi); udi = strdup(udi);
ret = e_hal_device_query_capability(_e_kbd_dbus_conn, udi, "input.keyboard", e_hal_device_query_capability(_e_kbd_dbus_conn, udi, "input.keyboard",
_e_kbd_dbus_cb_input_keyboard_is, _e_kbd_dbus_cb_input_keyboard_is,
strdup(udi)); strdup(udi));
} }

View File

@ -409,7 +409,6 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
{ {
int wx = 0, wy = 0, ww = 0, wh = 0; int wx = 0, wy = 0, ww = 0, wh = 0;
int wx2 = 0, wy2 = 0, ww2 = 0, wh2 = 0; int wx2 = 0, wy2 = 0, ww2 = 0, wh2 = 0;
int center = 0;
int isdialog = 0; int isdialog = 0;
int pbx, pby, pbw, pbh; int pbx, pby, pbw, pbh;

View File

@ -1011,7 +1011,7 @@ _apps_fm_config(Evas_Object *o)
static void static void
_apps_populate(void) _apps_populate(void)
{ {
Evas_Coord mw, mh, sfw, sfh; Evas_Coord sfw, sfh;
Evas_Object *o = NULL; Evas_Object *o = NULL;
char buf[PATH_MAX]; char buf[PATH_MAX];
int num = 0; int num = 0;

View File

@ -275,9 +275,9 @@ _grab_wnd_show(void *data1, void *data2)
man = e_manager_current_get(); man = e_manager_current_get();
cfdata->grab.btn = 0; cfdata->grab.btn = 0;
if ((int)data1 == BUTTON_DRAG) if ((long)data1 == BUTTON_DRAG)
cfdata->grab.btn = 1; cfdata->grab.btn = 1;
else if ((int)data1 == BUTTON_NOPLACE) else if ((long)data1 == BUTTON_NOPLACE)
cfdata->grab.btn = 2; cfdata->grab.btn = 2;
cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager", cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager",

View File

@ -18,7 +18,6 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label(E_Gadcon_Client_Class *client_class); static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
/* and actually define the gadcon class that this module provides (just 1) */ /* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class = static const E_Gadcon_Client_Class _gadcon_class =
{ {

View File

@ -70,7 +70,6 @@ EAPI int
wizard_page_show(E_Wizard_Page *pg) wizard_page_show(E_Wizard_Page *pg)
{ {
Evas_Object *o, *of, *ob; Evas_Object *o, *of, *ob;
Eina_List *l;
char *file; char *file;
int sel = -1; int sel = -1;
int i = 0; int i = 0;

View File

@ -83,6 +83,8 @@ static App apps[] =
// loaded and parsed to make it easier to add more in some dir somewhere // loaded and parsed to make it easier to add more in some dir somewhere
}; };
/* FIXME unused*/
#if 0
static int static int
_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2) _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
{ {
@ -90,6 +92,7 @@ _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
if (!d2->name) return -1; if (!d2->name) return -1;
return strcmp(d1->name, d2->name); return strcmp(d1->name, d2->name);
} }
#endif
static void static void
_app_write(App *a) _app_write(App *a)

View File

@ -21,7 +21,6 @@ wizard_page_init(E_Wizard_Page *pg)
{ {
Eina_List *desks = NULL; Eina_List *desks = NULL;
Efreet_Desktop *desk; Efreet_Desktop *desk;
int i;
efreet_util_init(); efreet_util_init();
@ -29,8 +28,6 @@ wizard_page_init(E_Wizard_Page *pg)
desks = eina_list_sort(desks, 0, (Eina_Compare_Cb)_cb_sort_desks); desks = eina_list_sort(desks, 0, (Eina_Compare_Cb)_cb_sort_desks);
EINA_LIST_FREE(desks, desk) EINA_LIST_FREE(desks, desk)
{ {
char dbuf[4096];
if (!desk->exec) continue; if (!desk->exec) continue;
efreet_desktop_ref(desk); efreet_desktop_ref(desk);
desktops = eina_list_append(desktops, desk); desktops = eina_list_append(desktops, desk);