diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index bf43c2da4..15d4a5f9a 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -1287,7 +1287,6 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) struct stat st; int broken_link; E_Fm2_Smart_Data *sd; - void **sdat; dir = e_fm2_real_path_get(l->data); sd = evas_object_smart_data_get(l->data); @@ -5477,7 +5476,6 @@ static void _e_fm2_removable_dev_add(const char *uuid) { E_Fm2_Removable *rem; - const char *lab; FILE *f; char buf[4096]; diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c index 3b66f0fe9..e3559f945 100644 --- a/src/bin/e_fm_main.c +++ b/src/bin/e_fm_main.c @@ -243,7 +243,6 @@ _e_ipc_cb_server_data(void *data, int type, void *event) Evas_List *files = NULL; struct dirent *dp; int dot_order = 0; - char *file; char buf[4096]; FILE *f; diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c index a1853ae43..e6b24b0f9 100644 --- a/src/bin/e_fm_prop.c +++ b/src/bin/e_fm_prop.c @@ -39,9 +39,11 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_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 int _advanced_apply_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); +#if 0 +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); +#endif static void _cb_icon_sel(void *data, void *data2); static void _cb_type(void *data, Evas_Object *obj, void *event_info); diff --git a/src/bin/e_int_config_dpms.c b/src/bin/e_int_config_dpms.c index a961084a7..360b7d51d 100644 --- a/src/bin/e_int_config_dpms.c +++ b/src/bin/e_int_config_dpms.c @@ -2,9 +2,6 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_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 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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); @@ -144,53 +141,6 @@ _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_save_queue(); } -static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) -{ - /* - * NOTE: Since the BASIC interface does not allow you to manipulate - * the suspend and off features, I have decided to have them disabled - * when applying changes from this dialog. - * - * I do this because the timeouts must always satisfy the following: - * standby <= suspend <= off - * and if you use the basic dialog, and increase the standby timeout - * you might very well unknowingly push it right up to the off timout. - * at which point, you monitor will turn off, instead of going into - * standby. Which could be annoying. - */ - cfdata->enable_suspend = 0; - cfdata->enable_off = 0; - - _apply_data(cfd, cfdata); - return 1; -} - -static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) -{ - Evas_Object *o, *of, *ob; - o = e_widget_list_add(evas, 0, 0); - - ob = e_widget_check_add(evas, _("Enable DPMS"), &(cfdata->enable_dpms)); - e_widget_list_object_append(o, ob, 1, 1 ,0); - - of = e_widget_framelist_add(evas, _("DPMS Timer(s)"), 0); - - ob = e_widget_check_add(evas, _("Standby"), &(cfdata->enable_standby)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), - 1.0, 90.0, 1.0, 0, &(cfdata->standby_timeout), - NULL, 200); - e_widget_on_change_hook_set(ob, _cb_standby_slider_change, cfdata); - cfdata->standby_slider = ob; - e_widget_framelist_object_append(of, ob); - - e_widget_list_object_append(o, of, 1, 1, 0.5); - e_dialog_resizable_set(cfd->dia, 0); - return o; -} - /* advanced window */ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) @@ -203,7 +153,7 @@ static Evas_Object * _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob; - E_Radio_Group *rg; + o = e_widget_list_add(evas, 0, 0); ob = e_widget_check_add(evas, _("Enable DPMS"), &(cfdata->enable_dpms)); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 2206c00a4..b8e29c7e7 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -1139,8 +1139,6 @@ static void _e_int_menus_clients_add_by_none(Evas_List *borders, E_Menu *m) { Evas_List *l = NULL, *ico = NULL; - E_Menu *subm; - E_Menu_Item *mi; for (l = borders; l; l = l->next) { @@ -1163,7 +1161,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m) { E_Menu *subm; E_Menu_Item *mi; - Evas_List *l = NULL, *borders = NULL, *alt = NULL; + Evas_List *l = NULL, *borders = NULL; E_Zone *zone = NULL; E_Desk *desk = NULL; Main_Data *dat;