From d013e1a873989f7f0c960afca98d9f9ca2101d7a Mon Sep 17 00:00:00 2001 From: sebastid Date: Mon, 21 Aug 2006 15:52:58 +0000 Subject: [PATCH] Add header include Export function Correct function declaration Remove char * cast Remove unused variable SVN revision: 25001 --- src/bin/e_color_dialog.c | 4 ++-- src/bin/e_fm.c | 2 +- src/bin/e_fm.h | 2 +- src/bin/e_includes.h | 1 + src/bin/e_int_config_wallpaper.h | 1 + src/bin/e_int_config_wallpaper_gradient.c | 4 ++-- src/bin/e_resist.c | 2 +- src/bin/e_test.c | 4 ++-- src/bin/e_widget_fsel.c | 6 +++--- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c index 0c9f9442e..0182730cc 100644 --- a/src/bin/e_color_dialog.c +++ b/src/bin/e_color_dialog.c @@ -7,7 +7,7 @@ static void _e_color_dialog_button1_click(void *data, E_Dialog *edia); static void _e_color_dialog_button2_click(void *data, E_Dialog *edia); static void _e_color_dialog_free(E_Color_Dialog *dia); -static void _e_color_dialog_dia_del(E_Object *obj); +static void _e_color_dialog_dia_del(void *obj); /** * Create a color selector dialog. @@ -108,7 +108,7 @@ _e_color_dialog_free(E_Color_Dialog *dia) } static void -_e_color_dialog_dia_del(E_Object *obj) +_e_color_dialog_dia_del(void *obj) { E_Dialog *dia = obj; E_Color_Dialog *cdia = dia->data; diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 5816d8624..ec4e080f2 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -428,7 +428,7 @@ e_fm2_all_list_get(Evas_Object *obj) } EAPI void -e_fm2_select_set(Evas_Object *obj, char *file, int select) +e_fm2_select_set(Evas_Object *obj, const char *file, int select) { E_Fm2_Smart_Data *sd; Evas_List *l; diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h index 185d43959..a6261beff 100644 --- a/src/bin/e_fm.h +++ b/src/bin/e_fm.h @@ -108,7 +108,7 @@ EAPI void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg) EAPI E_Fm2_Config *e_fm2_config_get(Evas_Object *obj); EAPI Evas_List *e_fm2_selected_list_get(Evas_Object *obj); EAPI Evas_List *e_fm2_all_list_get(Evas_Object *obj); -EAPI void e_fm2_select_set(Evas_Object *obj, char *file, int select); +EAPI void e_fm2_select_set(Evas_Object *obj, const char *file, int select); EAPI void e_fm2_file_show(Evas_Object *obj, char *file); EAPI void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index 62cdacc3c..f37625a6b 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -143,6 +143,7 @@ #include "e_fm_mime.h" #include "e_int_config_wallpaper.h" #include "e_int_config_wallpaper_import.h" +#include "e_int_config_wallpaper_gradient.h" #include "e_color.h" #include "e_spectrum.h" #include "e_widget_spectrum.h" diff --git a/src/bin/e_int_config_wallpaper.h b/src/bin/e_int_config_wallpaper.h index 5ee7652f7..1a401db8d 100644 --- a/src/bin/e_int_config_wallpaper.h +++ b/src/bin/e_int_config_wallpaper.h @@ -9,6 +9,7 @@ EAPI E_Config_Dialog *e_int_config_wallpaper(E_Container *con); EAPI void e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file); EAPI void e_int_config_wallpaper_import_done(E_Config_Dialog *dia); +EAPI void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia); #endif #endif diff --git a/src/bin/e_int_config_wallpaper_gradient.c b/src/bin/e_int_config_wallpaper_gradient.c index 2f745a81a..73fcac8bd 100644 --- a/src/bin/e_int_config_wallpaper_gradient.c +++ b/src/bin/e_int_config_wallpaper_gradient.c @@ -61,7 +61,7 @@ static void _import_cb_delete(E_Win *win); static void _import_cb_close(void *data, E_Dialog *dia); static void _import_cb_ok(void *data, E_Dialog *dia); static void _import_config_save(Import *import); -static void _import_cb_dia_del(E_Object *obj); +static void _import_cb_dia_del(void *obj); EAPI E_Dialog * e_int_config_wallpaper_gradient(E_Config_Dialog *parent) @@ -400,7 +400,7 @@ _import_cb_ok(void *data, E_Dialog *dia) } static void -_import_cb_dia_del(E_Object *obj) +_import_cb_dia_del(void *obj) { E_Dialog *dia = obj; e_int_config_wallpaper_gradient_del(dia); diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index 8cbe40b44..6de81d48e 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -118,7 +118,7 @@ e_resist_container_gadman_position(E_Container *con, Evas_List *skiplist, int x, int y, int w, int h, int *rx, int *ry) { - Evas_List *l, *ll, *rects = NULL; + Evas_List *l, *rects = NULL; E_Resist_Rect *r; if (!e_config->use_resist) diff --git a/src/bin/e_test.c b/src/bin/e_test.c index cf680c99c..da4b1d63b 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -465,9 +465,9 @@ _e_test_cb_favorites_selected(void *data, Evas_Object *obj, void *event_info) if (!selected) return; ici = selected->data; if ((ici->link) && (ici->mount)) - e_fm2_path_set(data, (char *)ici->link, "/"); + e_fm2_path_set(data, ici->link, "/"); else if (ici->link) - e_fm2_path_set(data, NULL, (char *)ici->link); + e_fm2_path_set(data, NULL, ici->link); // FIXME: this should happen on the scrollframe not the fm obj // e_widget_scrollframe_child_pos_set(data, 0, 0); evas_list_free(selected); diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index 2214adeda..06338f2b0 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -88,7 +88,7 @@ _e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj, void *event_in { if (!strcmp(p1, p2)) { - e_fm2_select_set(wd->o_favorites_fm, (char *)ici->file, 1); + e_fm2_select_set(wd->o_favorites_fm, ici->file, 1); E_FREE(p2); goto done; } @@ -115,9 +115,9 @@ _e_wid_fsel_favorites_selected(void *data, Evas_Object *obj, void *event_info) if (!selected) return; ici = selected->data; if ((ici->link) && (ici->mount)) - e_fm2_path_set(wd->o_files_fm, (char *)ici->link, "/"); + e_fm2_path_set(wd->o_files_fm, ici->link, "/"); else if (ici->link) - e_fm2_path_set(wd->o_files_fm, NULL, (char *)ici->link); + e_fm2_path_set(wd->o_files_fm, NULL, ici->link); evas_list_free(selected); e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0); }