From: Enlightenment C. <no...@cv...> - 2006-12-14 15:04:19
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Always need to check if therms is valid. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_mod_config.c 21 Oct 2006 02:32:14 -0000 1.24 +++ e_mod_config.c 14 Dec 2006 15:04:15 -0000 1.25 @@ -119,19 +119,25 @@ else if (!strcmp(temperature_config->sensor_name, "temp3")) cfdata->sensor = 2; } - cfdata->acpizone= 0; + cfdata->acpizone = 0; if (temperature_config->acpi_sel) { therms = ecore_file_ls("/proc/acpi/thermal_zone"); - char *tzone; - int n = 0; - while ((tzone = ecore_list_next(therms))) - { - if (!strcmp(temperature_config->acpi_sel, tzone)) - cfdata->acpizone = n; - else n++; + if (therms) + { + char *tzone; + int n = 0; + while ((tzone = ecore_list_next(therms))) + { + if (!strcmp(temperature_config->acpi_sel, tzone)) + { + cfdata->acpizone = n; + break; + } + else n++; + } + ecore_list_destroy(therms); } - ecore_list_destroy(therms); } } @@ -290,45 +296,36 @@ if (!f) { therms = ecore_file_ls("/sys/bus/i2c/devices"); - if (therms) + if ((therms) && (!ecore_list_is_empty(therms))) { - if (!ecore_list_is_empty(therms)) - { - of = e_widget_framelist_add(evas, _("Sensors"), 0); - rg = e_widget_radio_group_new(&(cfdata->sensor)); - ob = e_widget_radio_add(evas, _("Temp 1"), 0, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Temp 2"), 1, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Temp 3"), 2, rg); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - } - ecore_list_destroy(therms); - therms = NULL; + of = e_widget_framelist_add(evas, _("Sensors"), 0); + rg = e_widget_radio_group_new(&(cfdata->sensor)); + ob = e_widget_radio_add(evas, _("Temp 1"), 0, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Temp 2"), 1, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Temp 3"), 2, rg); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); } + if (therms) ecore_list_destroy(therms); } } else { - if (!ecore_list_is_empty(therms)) + of = e_widget_framelist_add(evas, _("ACPI Temperature"), 0); + rg = e_widget_radio_group_new(&(cfdata->acpizone)); + char *tzone; + int n = 0; + while ((tzone = ecore_list_next(therms))) { - of = e_widget_framelist_add(evas, _("ACPI Temperature"), 0); - rg = e_widget_radio_group_new(&(cfdata->acpizone)); - char *tzone; - int n = 0; - while ((tzone = ecore_list_next(therms))) - { - ob = e_widget_radio_add(evas, _(tzone), n, rg); - e_widget_framelist_object_append(of, ob); - n++; - } - e_widget_list_object_append(o, of, 1, 1, 0.5); - ecore_list_destroy(therms); - therms = NULL; + ob = e_widget_radio_add(evas, _(tzone), n, rg); + e_widget_framelist_object_append(of, ob); + n++; } + e_widget_list_object_append(o, of, 1, 1, 0.5); + ecore_list_destroy(therms); } - if (therms) ecore_list_destroy(therms); #endif of = e_widget_framelist_add(evas, _("Check Interval"), 0); @@ -381,6 +378,10 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { + int n = 0; + Ecore_List *therms; + char *tzone; + if (cfdata->unit_method != temperature_config->units) { if (cfdata->unit_method == 0) @@ -419,20 +420,20 @@ if (temperature_config->acpi_sel) evas_stringshare_del(temperature_config->acpi_sel); temperature_config->acpi_sel = NULL; - int n = 0; - Ecore_List *therms; - char *tzone; therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if ((therms) || !ecore_list_is_empty(therms)) + if (therms) { while ((tzone = ecore_list_next(therms))) { if (n == cfdata->acpizone) - temperature_config->acpi_sel = evas_stringshare_add(tzone); + { + temperature_config->acpi_sel = evas_stringshare_add(tzone); + break; + } n++; } + ecore_list_destroy(therms); } - ecore_list_destroy(therms); _temperature_face_cb_config_updated(); e_config_save_queue(); return 1; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:07:48
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_main.c Log Message: Don't set a default ACPI temperature sensor. Use the first available temperature sensor if none is set. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- e_mod_main.c 21 Oct 2006 02:32:14 -0000 1.71 +++ e_mod_main.c 14 Dec 2006 15:07:47 -0000 1.72 @@ -269,14 +269,15 @@ } else { - char *name; + const char *name; - ret = 1; - while ((name = ecore_list_next(therms))) + ret = 0; + name = temperature_config->acpi_sel; + if (!name) name = ecore_list_next(therms); + if (name) { char *p, *q; FILE *f; - name = temperature_config->acpi_sel; snprintf(buf, sizeof(buf), "/proc/acpi/thermal_zone/%s/temperature", name); f = fopen(buf, "rb"); if (f) @@ -284,16 +285,15 @@ fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; fclose(f); p = strchr(buf, ':'); - if (!p) + if (p) { - ret = 0; - continue; + p++; + while (*p == ' ') p++; + q = strchr(p, ' '); + if (q) *q = 0; + temp = atoi(p); + ret = 1; } - p++; - while (*p == ' ') p++; - q = strchr(p, ' '); - if (q) *q = 0; - temp = atoi(p); } } ecore_list_destroy(therms); @@ -414,7 +414,7 @@ temperature_config->high = 80; temperature_config->sensor_name = evas_stringshare_add("temp1"); temperature_config->units = CELCIUS; - temperature_config->acpi_sel = evas_stringshare_add("TZ1"); + temperature_config->acpi_sel = NULL; } E_CONFIG_LIMIT(temperature_config->poll_time, 0.5, 1000.0); E_CONFIG_LIMIT(temperature_config->low, 0, 100); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:28:31
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c Log Message: Remove unused variables. hash callback func should return 1 if the whole hash is to be checked. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.246 retrieving revision 1.247 diff -u -3 -r1.246 -r1.247 --- e_apps.c 10 Dec 2006 09:27:33 -0000 1.246 +++ e_apps.c 14 Dec 2006 15:28:27 -0000 1.247 @@ -50,7 +50,6 @@ double begin, pass; }; -static Evas_Bool _e_apps_hash_cb_init (Evas_Hash *hash, const char *key, void *data, void *fdata); static int _e_apps_hash_idler_cb (void *data); static void _e_app_free (E_App *a); static E_App *_e_app_subapp_file_find (E_App *a, const char *file); @@ -199,8 +198,6 @@ #if IDLE_ICONS if ((!a->idle_icon) && (a->icon_type == E_APP_ICON_UNKNOWN)) { - int theme_match = 0; - a->idle_icon = 1; _e_app_icon_type(a); } @@ -1266,6 +1263,7 @@ winner->ok = (*count); } free(count); + return 1; } #endif @@ -1273,8 +1271,8 @@ EAPI E_App * e_app_border_find(E_Border *bd) { - Evas_List *l, *l_match = NULL; - int ok, match = 0; + Evas_List *l; + int ok; E_App *a = NULL, *a_match = NULL, *clever_match = NULL; char *title; double begin, time, clever_time = 0.0; @@ -1781,9 +1779,7 @@ EAPI void e_app_fields_fill(E_App *a, const char *path) { - char *str, *v; const char *lang; - int size; /* get our current language */ lang = e_intl_language_alias_get(); @@ -1892,7 +1888,7 @@ e_app_fields_save(E_App *a) { char buf[PATH_MAX]; - const char *lang, *ext = NULL; + const char *ext = NULL; int new_eap = 0; E_OBJECT_CHECK(a); @@ -1982,7 +1978,6 @@ _e_app_fields_save_others(E_App *a) { Evas_List *l; - char buf[PATH_MAX]; for (l = a->references; l; l = l->next) { |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:32:40
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_theme.c Log Message: Remove unused variable. Don't abuse pointers. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_theme.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_theme.c 21 Oct 2006 10:28:01 -0000 1.26 +++ e_theme.c 14 Dec 2006 15:32:38 -0000 1.27 @@ -244,12 +244,17 @@ } if (coll) edje_file_collection_list_free(coll); } - ok = evas_hash_find(res->quickfind, group); /* save in the group cache hash */ - if (ok) - group_cache = evas_hash_add(group_cache, buf, res); + if (evas_hash_find(res->quickfind, group)) + { + group_cache = evas_hash_add(group_cache, buf, res); + ok = 1; + } else - group_cache = evas_hash_add(group_cache, buf, (void *)1); + { + group_cache = evas_hash_add(group_cache, buf, (void *)1); + ok = 0; + } } else if (tres == (void *)1) /* special pointer "1" == not there */ ok = 0; @@ -274,7 +279,6 @@ e_theme_file_set(const char *category, const char *file) { E_Theme_Result *res; - char buf[4096]; if (group_cache) { |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:34:03
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_remember.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_remember.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_remember.c 31 Oct 2006 11:18:34 -0000 1.20 +++ e_remember.c 14 Dec 2006 15:34:01 -0000 1.21 @@ -403,9 +403,7 @@ #endif #if REMEMBER_HIERARCHY Evas_List *l; - E_Remember *best_rem; - int best_score = 0; - + /* This search method finds the best possible match available and is * based on the fact that the list is sorted, with those remembers * with the most possible matches at the start of the list. This @@ -415,7 +413,6 @@ { E_Remember *rem; const char *title = ""; - int score = 0; rem = l->data; if (check_usable && !e_remember_usable_get(rem)) |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:36:10
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_keybindings.c e_int_config_mousebindings.c Log Message: Remove unused variables. Fix assignment, should be a test. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- e_int_config_keybindings.c 11 Dec 2006 10:19:46 -0000 1.45 +++ e_int_config_keybindings.c 14 Dec 2006 15:36:09 -0000 1.46 @@ -644,9 +644,6 @@ _update_action_list(E_Config_Dialog_Data *cfdata) { E_Config_Binding_Key *bi; - E_Action_Group *actg; - E_Action_Description *actd; - Evas_List *l, *l2; int j = -1, i, n; const char *action, *params; @@ -996,7 +993,6 @@ static int _grab_key_down_cb(void *data, int type, void *event) { - E_Config_Binding_Key *bi; E_Config_Dialog_Data *cfdata; Ecore_X_Event_Key_Down *ev; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mousebindings.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_int_config_mousebindings.c 10 Dec 2006 15:35:13 -0000 1.11 +++ e_int_config_mousebindings.c 14 Dec 2006 15:36:09 -0000 1.12 @@ -708,9 +708,6 @@ { E_Config_Binding_Mouse *eb; E_Config_Binding_Wheel *bw; - E_Action_Group *actg; - E_Action_Description *actd; - Evas_List *l, *l2; const char *action, *params; int j = -1, i, n; @@ -933,7 +930,7 @@ action = eb->action; params = eb->params; } - else if (cfdata->locals.cur[0] = 'w') + else if (cfdata->locals.cur[0] == 'w') { sscanf(cfdata->locals.cur, "w%d", &b); bw = evas_list_nth(cfdata->binding.wheel, b); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:37:36
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_display.c e_int_config_fonts.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_int_config_display.c 27 Nov 2006 15:56:58 -0000 1.29 +++ e_int_config_display.c 14 Dec 2006 15:37:35 -0000 1.30 @@ -316,7 +316,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { const char *sel_res, *sel_rate; - int i, n, k, rr; Ecore_X_Screen_Size size; Ecore_X_Screen_Refresh_Rate rate; E_Manager *man; @@ -419,8 +418,6 @@ else { Evas_List *l; - Ecore_X_Screen_Refresh_Rate c_rate; - Ecore_X_Screen_Size c_size; cfdata->orig_size = ecore_x_randr_current_screen_size_get(man->root); cfdata->orig_rate = ecore_x_randr_current_screen_refresh_rate_get(man->root); @@ -550,8 +547,6 @@ _load_rates(E_Config_Dialog_Data *cfdata) { int r, k = 0, sel = 0; - Ecore_X_Screen_Refresh_Rate rt; - Ecore_X_Screen_Refresh_Rate *rts; char buf[16]; Evas_List *l; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_int_config_fonts.c 27 Nov 2006 15:39:34 -0000 1.30 +++ e_int_config_fonts.c 14 Dec 2006 15:37:35 -0000 1.31 @@ -282,8 +282,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob, *ot, *ott; - Evas_List *next, *fonts, *l = NULL; - int option_enable; + Evas_List *fonts, *l = NULL; cfdata->cur_index = -1; cfdata->evas = evas; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:39:04
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_color_classes.c e_int_config_mime.c e_int_config_mime_edit.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_color_classes.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_int_config_color_classes.c 27 Nov 2006 15:35:25 -0000 1.25 +++ e_int_config_color_classes.c 14 Dec 2006 15:39:00 -0000 1.26 @@ -407,8 +407,7 @@ { Evas_Object *o, *of, *ob, *ot; E_Radio_Group *rg; - Evas_List *l; - + o = e_widget_list_add(evas, 0, 0); ot = e_widget_table_add(evas, 0); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_int_config_mime.c 28 Nov 2006 11:08:44 -0000 1.19 +++ e_int_config_mime.c 14 Dec 2006 15:39:00 -0000 1.20 @@ -182,7 +182,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ol; - Evas_Object *ot, *ob; + Evas_Object *ob; o = e_widget_list_add(evas, 0, 1); of = e_widget_framelist_add(evas, _("Categories"), 0); @@ -542,7 +542,6 @@ Evas_List *l; E_Config_Dialog_Data *cfdata; E_Config_Mime_Icon *mi = NULL; - E_Config_Dialog *edit_dlg; char *m; int found = 0; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime_edit.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_mime_edit.c 28 Nov 2006 11:08:44 -0000 1.13 +++ e_int_config_mime_edit.c 14 Dec 2006 15:39:00 -0000 1.14 @@ -290,7 +290,6 @@ Evas *evas; E_Config_Dialog_Data *cfdata; Evas_Object *icon = NULL; - const char *tmp; char buf[4096]; cfdata = data; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:39:29
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_exehist.c Log Message: Add return value. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_exehist.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_exehist.c 29 Oct 2006 09:04:26 -0000 1.7 +++ e_exehist.c 14 Dec 2006 15:39:26 -0000 1.8 @@ -226,7 +226,7 @@ if (!mime) return NULL; _e_exehist_load(); - if (!_e_exehist) return; + if (!_e_exehist) return NULL; for (l = _e_exehist->mimes; l; l = l->next) { ei = l->data; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:40:22
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_border_prop.c e_int_config_shelf.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_int_border_prop.c 30 Nov 2006 18:01:29 -0000 1.11 +++ e_int_border_prop.c 14 Dec 2006 15:40:19 -0000 1.12 @@ -67,8 +67,6 @@ e_int_border_prop(E_Border *bd) { E_Dialog *dia; - Evas_Object *o, *ob; - Evas_Coord w, h; if (bd->border_prop_dialog) return; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- e_int_config_shelf.c 27 Nov 2006 16:35:30 -0000 1.28 +++ e_int_config_shelf.c 14 Dec 2006 15:40:19 -0000 1.29 @@ -272,8 +272,7 @@ _cb_dialog_yes(void *data) { Shelf_Del_Confirm_Data *d; - E_Shelf *es; - + d = data; if (!data) return; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:44:50
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_prop.h Log Message: Correct header define. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_prop.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_fm_prop.h 4 Dec 2006 12:14:17 -0000 1.1 +++ e_fm_prop.h 14 Dec 2006 15:44:47 -0000 1.2 @@ -3,8 +3,8 @@ */ #ifdef E_TYPEDEFS #else -#ifndef E_INT_CONFIG_FOCUS_H -#define E_INT_CONFIG_FOCUS_H +#ifndef E_FM_PROP_H +#define E_FM_PROP_H EAPI E_Config_Dialog *e_fm_prop_file(E_Container *con, E_Fm2_Icon_Info *fi); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:47:00
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fwin.c e_int_config_wallpaper.c e_widget_color_well.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_fwin.c 19 Nov 2006 03:43:18 -0000 1.24 +++ e_fwin.c 14 Dec 2006 15:46:58 -0000 1.25 @@ -709,7 +709,7 @@ */ if (evas_list_count(mlist) <= 1) { - char pcwd[4096], buf[4096], *cmd; + char pcwd[4096], *cmd; Ecore_List *files_list = NULL, *cmds = NULL; need_dia = 1; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_int_config_wallpaper.c 1 Dec 2006 17:26:11 -0000 1.26 +++ e_int_config_wallpaper.c 14 Dec 2006 15:46:58 -0000 1.27 @@ -350,7 +350,6 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - Evas_List *l; char path[4096]; E_Config_Wallpaper *cw; const E_Config_Desktop_Background *cfbg; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_color_well.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_widget_color_well.c 14 Oct 2006 05:04:01 -0000 1.13 +++ e_widget_color_well.c 14 Dec 2006 15:46:58 -0000 1.14 @@ -125,7 +125,6 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog) { Evas_Object *obj, *o; - Evas_Coord mw, mh; E_Widget_Data *wd; E_Win *win; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:48:15
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_filereg.c Log Message: Add return value. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_filereg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_filereg.c 17 Oct 2006 12:29:00 -0000 1.1 +++ e_filereg.c 14 Dec 2006 15:48:10 -0000 1.2 @@ -42,6 +42,7 @@ } _e_filereg = evas_list_free(_e_filereg); + return 1; } EAPI int |
From: Enlightenment C. <no...@cv...> - 2006-12-14 15:55:39
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm.c Log Message: Remove unused variables. Add cast for printf. char -> const char =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.117 retrieving revision 1.118 diff -u -3 -r1.117 -r1.118 --- e_fm.c 9 Dec 2006 04:46:37 -0000 1.117 +++ e_fm.c 14 Dec 2006 15:55:35 -0000 1.118 @@ -159,8 +159,8 @@ struct _E_Fm2_Action { E_Fm2_Action_Type type; - char *file; - char *file2; + const char *file; + const char *file2; int flags; }; @@ -187,8 +187,8 @@ }; static const char *_e_fm2_dev_path_map(const char *dev, const char *path); -static void _e_fm2_file_add(Evas_Object *obj, char *file, int unique, char *file_rel, int after); -static void _e_fm2_file_del(Evas_Object *obj, char *file); +static void _e_fm2_file_add(Evas_Object *obj, const char *file, int unique, const char *file_rel, int after); +static void _e_fm2_file_del(Evas_Object *obj, const char *file); static void _e_fm2_scan_start(Evas_Object *obj); static void _e_fm2_scan_stop(Evas_Object *obj); static void _e_fm2_queue_process(Evas_Object *obj); @@ -200,7 +200,7 @@ static void _e_fm2_regions_eval(Evas_Object *obj); static void _e_fm2_config_free(E_Fm2_Config *cfg); -static E_Fm2_Icon *_e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file); +static E_Fm2_Icon *_e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file); static void _e_fm2_icon_unfill(E_Fm2_Icon *ic); static int _e_fm2_icon_fill(E_Fm2_Icon *ic); static void _e_fm2_icon_free(E_Fm2_Icon *ic); @@ -294,8 +294,8 @@ static void _e_fm2_file_delete_no_cb(void *data, E_Dialog *dialog); static void _e_fm2_refresh_job_cb(void *data); -static void _e_fm2_live_file_add(Evas_Object *obj, char *file, char *file_rel, int after); -static void _e_fm2_live_file_del(Evas_Object *obj, char *file); +static void _e_fm2_live_file_add(Evas_Object *obj, const char *file, const char *file_rel, int after); +static void _e_fm2_live_file_del(Evas_Object *obj, const char *file); static void _e_fm2_live_file_changed(Evas_Object *obj, char *file); static void _e_fm2_live_process_begin(Evas_Object *obj); static void _e_fm2_live_process_end(Evas_Object *obj); @@ -992,7 +992,7 @@ } static void -_e_fm2_file_add(Evas_Object *obj, char *file, int unique, char *file_rel, int after) +_e_fm2_file_add(Evas_Object *obj, const char *file, int unique, const char *file_rel, int after) { E_Fm2_Smart_Data *sd; E_Fm2_Icon *ic, *ic2; @@ -1070,7 +1070,7 @@ } static void -_e_fm2_file_del(Evas_Object *obj, char *file) +_e_fm2_file_del(Evas_Object *obj, const char *file) { E_Fm2_Smart_Data *sd; E_Fm2_Icon *ic; @@ -1629,7 +1629,7 @@ /**************************/ static E_Fm2_Icon * -_e_fm2_icon_new(E_Fm2_Smart_Data *sd, char *file) +_e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file) { E_Fm2_Icon *ic; @@ -3025,12 +3025,9 @@ { E_Fm2_Smart_Data *sd; E_Event_Dnd_Drop *ev; - E_Fm2_Icon *ic; Evas_List *fsel, *l, *ll; - int i, refresh = 0; char buf[4096], *fl, *d; - FILE *f; - + sd = data; if (!type) return; if (strcmp(type, "text/uri-list")) return; @@ -3125,7 +3122,7 @@ /* move the file into the subdir */ snprintf(buf, sizeof(buf), "%s/%s/%s", sd->realpath, sd->drop_icon->info.file, ecore_file_get_file(ll->data)); - printf("mv %s %s\n", ll->data, buf); + printf("mv %s %s\n", (char *)ll->data, buf); e_fm2_fop_move_add(sd->obj, ll->data, buf, NULL, 0, 0); @@ -3211,7 +3208,7 @@ /* move the file into the subdir */ snprintf(buf, sizeof(buf), "%s/%s", sd->realpath, ecore_file_get_file(ll->data)); - printf("mv %s %s\n", ll->data, buf); + printf("mv %s %s\n", (char *)ll->data, buf); e_fm2_fop_move_add(sd->obj, ll->data, buf, NULL, 0, 1); @@ -3359,10 +3356,8 @@ _e_fm2_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Mouse_Down *ev; - E_Fm2_Icon *ic, *ic2; - int multi_sel = 0, range_sel = 0, seen = 0; - Evas_List *l; - + E_Fm2_Icon *ic; + ic = data; ev = event_info; if ((ev->button == 1) && (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)) @@ -4941,8 +4936,7 @@ E_Fm2_Icon *ic; E_Manager *man; E_Container *con; - char text[PATH_MAX + 256]; - + ic = data; if (ic->entry_dialog) return; @@ -5013,8 +5007,6 @@ static void _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog) { - E_Manager *man; - E_Container *con; E_Fm2_Icon *ic; char buf[4096]; Evas_List *sel, *l; @@ -5149,7 +5141,7 @@ static void -_e_fm2_live_file_add(Evas_Object *obj, char *file, char *file_rel, int after) +_e_fm2_live_file_add(Evas_Object *obj, const char *file, const char *file_rel, int after) { E_Fm2_Smart_Data *sd; E_Fm2_Action *a; @@ -5167,7 +5159,7 @@ } static void -_e_fm2_live_file_del(Evas_Object *obj, char *file) +_e_fm2_live_file_del(Evas_Object *obj, const char *file) { E_Fm2_Smart_Data *sd; E_Fm2_Action *a; @@ -5298,7 +5290,7 @@ double t; sd = evas_object_smart_data_get(data); - if (!sd) return NULL; + if (!sd) return 0; t = ecore_time_get(); do { @@ -5349,9 +5341,7 @@ { E_Fm2_Smart_Data *sd; char *file; - Evas_List *l; - E_Fm2_Icon *ic; - + sd = evas_object_smart_data_get(data); if (!sd) return; file = (char *)ecore_file_get_file(path); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:25:22
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_desk.c Log Message: Return 1 on successful apply =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desk.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_desk.c 15 Nov 2006 11:50:06 -0000 1.3 +++ e_int_config_desk.c 14 Dec 2006 19:25:19 -0000 1.4 @@ -127,6 +127,7 @@ e_bg_update(); e_config_save_queue(); + return 1; } static Evas_Object * |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:26:35
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_start_main.c Log Message: Add missing header. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_start_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_start_main.c 5 Nov 2006 05:57:47 -0000 1.11 +++ e_start_main.c 14 Dec 2006 19:26:29 -0000 1.12 @@ -5,6 +5,7 @@ #include <string.h> #include <dlfcn.h> #include <sys/types.h> +#include <sys/wait.h> #include <sys/stat.h> #include <sys/utsname.h> #include <fcntl.h> |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:27:47
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_sys_main.c Log Message: Add missing header. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_sys_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_sys_main.c 28 Sep 2006 06:35:43 -0000 1.6 +++ e_sys_main.c 14 Dec 2006 19:27:46 -0000 1.7 @@ -11,6 +11,7 @@ #include <pwd.h> #include <grp.h> #include <fnmatch.h> +#include <ctype.h> #ifdef HAVE_ALLOCA_H #include <alloca.h> #endif |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:28:38
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_prop.c e_widget_desk_preview.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_prop.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_fm_prop.c 9 Dec 2006 06:28:25 -0000 1.3 +++ e_fm_prop.c 14 Dec 2006 19:28:36 -0000 1.4 @@ -101,7 +101,6 @@ static void _fill_data(E_Config_Dialog_Data *cfdata, E_Fm2_Icon_Info *fi) { - char buf[4096]; struct passwd *pw; cfdata->fi = fi; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_desk_preview.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_widget_desk_preview.c 27 Nov 2006 12:58:46 -0000 1.10 +++ e_widget_desk_preview.c 14 Dec 2006 19:28:36 -0000 1.11 @@ -124,7 +124,6 @@ _e_wid_reconfigure(E_Widget_Data *wd) { Evas_List *l, *delete = NULL; - Evas_Object *o; int x, y; int aw, ah; /* available */ int mw, mh; /* min size for each desk */ @@ -218,7 +217,6 @@ { Evas_Object *obj, *o; E_Widget_Data *wd; - Evas_Coord iw, ih; E_Zone *zone; obj = e_widget_add(evas); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:29:26
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_zone.c e_zone.h Log Message: char -> const char =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -3 -r1.105 -r1.106 --- e_zone.c 29 Oct 2006 10:29:45 -0000 1.105 +++ e_zone.c 14 Dec 2006 19:29:24 -0000 1.106 @@ -596,7 +596,7 @@ } EAPI int -e_zone_exec(E_Zone *zone, char *exe) +e_zone_exec(E_Zone *zone, const char *exe) { int ret = 0; char *p1, *p2; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- e_zone.h 21 Jul 2006 00:46:40 -0000 1.37 +++ e_zone.h 14 Dec 2006 19:29:24 -0000 1.38 @@ -90,7 +90,7 @@ EAPI void e_zone_flip_win_disable(void); EAPI void e_zone_flip_win_restore(void); -EAPI int e_zone_exec(E_Zone *zone, char *exe); +EAPI int e_zone_exec(E_Zone *zone, const char *exe); EAPI int e_zone_app_exec(E_Zone *zone, E_App *a); extern EAPI int E_EVENT_ZONE_DESK_COUNT_SET; |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:31:49
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -3 -r1.160 -r1.161 --- e_mod_main.c 2 Dec 2006 10:15:32 -0000 1.160 +++ e_mod_main.c 14 Dec 2006 19:31:48 -0000 1.161 @@ -1095,7 +1095,6 @@ * the simplest. */ if (inst->gcc->autoscroll && ic) { - Evas_Coord ix, iy, iw, ih; double ax,ay; e_box_align_get(inst->gcc->o_box, &ax, &ay); @@ -1175,11 +1174,7 @@ { E_Event_Dnd_Move *ev; Instance *inst; - IBar_Icon *ic; - Evas_Coord xx, yy; - int x, y; - int wx, wy; - + ev = event_info; inst = data; @@ -1325,7 +1320,6 @@ e_app_files_list_append(fl, inst->ibar->apps); } } - clean: evas_object_del(inst->ibar->o_drop); inst->ibar->o_drop = NULL; evas_object_del(inst->ibar->o_drop_over); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:37:04
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/cpufreq Modified Files: freqset.c Log Message: Declare function. Make internal function static. Remove unused variables. Formatting. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/freqset.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- freqset.c 3 Sep 2006 08:51:32 -0000 1.4 +++ freqset.c 14 Dec 2006 19:36:59 -0000 1.5 @@ -1,3 +1,6 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -9,12 +12,11 @@ #include <sys/sysctl.h> #endif +static int sys_cpu_setall(const char *control, const char *value); + int main(int argc, char *argv[]) { - int new_frequency = 0; - FILE *f; - if (argc != 3) { fprintf(stderr, "Invalid command. Syntax:\n"); @@ -53,7 +55,7 @@ #else if (!strcmp(argv[1], "frequency")) { - if(sys_cpu_setall("scaling_setspeed", argv[2]) == 0) + if (sys_cpu_setall("scaling_setspeed", argv[2]) == 0) { fprintf(stderr, "Unable to open frequency interface for writing.\n"); return 1; @@ -63,7 +65,7 @@ } else if (!strcmp(argv[1], "governor")) { - if(sys_cpu_setall("scaling_governor", argv[2]) == 0) + if (sys_cpu_setall("scaling_governor", argv[2]) == 0) { fprintf(stderr, "Unable to open governor interface for writing.\n"); return 1; @@ -81,22 +83,25 @@ seteuid(-1); } -int sys_cpu_setall(const char *control, const char *value) +static int +sys_cpu_setall(const char *control, const char *value) { - int num = 0; - char filename[4096]; - FILE *f; - - while(1){ - snprintf(filename, sizeof(filename), "/sys/devices/system/cpu/cpu%i/cpufreq/%s", num, control); - f = fopen(filename, "w"); - - if(!f){ - return(num); - } - fprintf(f, "%s\n", value); - fclose(f); - num++; - } - return -1; + int num = 0; + char filename[4096]; + FILE *f; + + while (1) + { + snprintf(filename, sizeof(filename), "/sys/devices/system/cpu/cpu%i/cpufreq/%s", num, control); + f = fopen(filename, "w"); + + if (!f) + { + return(num); + } + fprintf(f, "%s\n", value); + fclose(f); + num++; + } + return -1; } |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:37:58
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_main.c Log Message: Remove unused variables. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -3 -r1.75 -r1.76 --- e_mod_main.c 30 Nov 2006 18:07:50 -0000 1.75 +++ e_mod_main.c 14 Dec 2006 19:37:51 -0000 1.76 @@ -883,10 +883,7 @@ E_Event_Dnd_Enter *ev; Instance *inst; Evas_Object *o, *o2; - IBox_Icon *ic; - Evas_Coord xx, yy; - int x, y; - + ev = event_info; inst = data; o = edje_object_add(evas_object_evas_get(inst->ibox->o_box)); @@ -912,10 +909,7 @@ { E_Event_Dnd_Move *ev; Instance *inst; - IBox_Icon *ic; - Evas_Coord xx, yy; - int x, y; - + ev = event_info; inst = data; _ibox_drop_position_update(inst, ev->x, ev->y); |
From: Enlightenment C. <no...@cv...> - 2006-12-14 19:42:25
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_apps.c e_int_config_desklock.c e_int_config_wallpaper_gradient.c e_shelf.c Log Message: Remove undefined functions. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- e_int_config_apps.c 2 Dec 2006 00:31:11 -0000 1.52 +++ e_int_config_apps.c 14 Dec 2006 19:42:21 -0000 1.53 @@ -14,7 +14,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 void _move_file_up_in_order(const char *order, const char *file); static void _move_file_down_in_order(const char *order, const char *file); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_int_config_desklock.c 4 Nov 2006 12:53:34 -0000 1.42 +++ e_int_config_desklock.c 14 Dec 2006 19:42:21 -0000 1.43 @@ -29,8 +29,6 @@ /******************************************************************************************/ static int _e_desklock_zone_num_get(void); -static void _load_bgs(E_Config_Dialog_Data *cfdata); -static void _ibg_list_cb_bg_selected(void *data); static void _e_desklock_cb_show_passwd(void *data, Evas_Object *obj); static void _e_desklock_cb_lb_show_change(void *data, Evas_Object *obj); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_int_config_wallpaper_gradient.c 14 Oct 2006 05:16:00 -0000 1.17 +++ e_int_config_wallpaper_gradient.c 14 Dec 2006 19:42:21 -0000 1.18 @@ -52,8 +52,6 @@ static void _import_cb_ok(void *data, E_Dialog *dia); static void _import_config_save(Import *import); static void _import_cb_dia_del(void *obj); -static void _preview_widget_grad_resize(void *data, Evas_Object *obj, - Evas_Coord w, Evas_Coord h); static Evas_Object *_preview_widget_add(Evas *evas); static void _import_cb_on_change(void *data, Evas_Object *obj); static void _import_cb_color_swap(void *data, void *data2); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- e_shelf.c 30 Oct 2006 10:42:23 -0000 1.43 +++ e_shelf.c 14 Dec 2006 19:42:21 -0000 1.44 @@ -12,7 +12,6 @@ static void _e_shelf_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_shelf_cb_menu_contents(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_shelf_cb_confirm_dialog_yes(void *data); -static void _e_shelf_cb_confirm_dialog_no(void *data); static void _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_shelf_menu_append(E_Shelf *es, E_Menu *mn); static void _e_shelf_cb_menu_items_append(void *data, E_Menu *mn); |
From: Enlightenment C. <no...@cv...> - 2006-12-15 08:32:35
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Only check the type of sensor on init and when changing config. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_mod_config.c 14 Dec 2006 15:04:15 -0000 1.25 +++ e_mod_config.c 15 Dec 2006 08:32:31 -0000 1.26 @@ -29,7 +29,7 @@ int high_temp; int sensor; - int acpizone; + Ecore_List *sensors; }; /* Protos */ @@ -67,8 +67,9 @@ static void _fill_data(E_Config_Dialog_Data *cfdata) { - double p; + double p; Ecore_List *therms; + char *name; cfdata->units = temperature_config->units; if (temperature_config->units == CELCIUS) @@ -110,34 +111,46 @@ cfdata->high_method = TEMP_HIGH_HIGH; cfdata->sensor = 0; - if (temperature_config->sensor_name) - { - if (!strcmp(temperature_config->sensor_name, "temp1")) - cfdata->sensor = 0; - else if (!strcmp(temperature_config->sensor_name, "temp2")) - cfdata->sensor = 1; - else if (!strcmp(temperature_config->sensor_name, "temp3")) - cfdata->sensor = 2; - } - cfdata->acpizone = 0; - if (temperature_config->acpi_sel) + switch (temperature_config->sensor_type) { - therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if (therms) - { - char *tzone; - int n = 0; - while ((tzone = ecore_list_next(therms))) - { - if (!strcmp(temperature_config->acpi_sel, tzone)) - { - cfdata->acpizone = n; - break; - } - else n++; - } - ecore_list_destroy(therms); - } + case SENSOR_TYPE_NONE: + break; + case SENSOR_TYPE_FREEBSD: + break; + case SENSOR_TYPE_OMNIBOOK: + break; + case SENSOR_TYPE_LINUX_MACMINI: + break; + case SENSOR_TYPE_LINUX_I2C: + ecore_list_append(cfdata->sensors, strdup("temp1")); + ecore_list_append(cfdata->sensors, strdup("temp2")); + ecore_list_append(cfdata->sensors, strdup("temp3")); + ecore_list_goto_first(cfdata->sensors); + while ((name = ecore_list_next(cfdata->sensors))) + { + if (!strcmp(temperature_config->sensor_name, name)) + break; + cfdata->sensor++; + } + break; + case SENSOR_TYPE_LINUX_ACPI: + therms = ecore_file_ls("/proc/acpi/thermal_zone"); + if (therms) + { + int n = 0; + + while ((name = ecore_list_next(therms))) + { + ecore_list_append(cfdata->sensors, strdup(name)); + if (!strcmp(temperature_config->sensor_name, name)) + { + cfdata->sensor = n; + } + n++; + } + ecore_list_destroy(therms); + } + break; } } @@ -147,6 +160,8 @@ E_Config_Dialog_Data *cfdata; cfdata = E_NEW(E_Config_Dialog_Data, 1); + cfdata->sensors = ecore_list_new(); + ecore_list_set_free_cb(cfdata->sensors, free); _fill_data(cfdata); return cfdata; } @@ -155,6 +170,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { temperature_config->config_dialog = NULL; + if (cfdata->sensors) ecore_list_destroy(cfdata->sensors); + cfdata->sensors = NULL; free(cfdata); } @@ -276,57 +293,24 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); -#ifndef __FreeBSD__ - Ecore_List *therms; - - therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if ((!therms) || (ecore_list_is_empty(therms))) + if (!ecore_list_is_empty(cfdata->sensors)) { - FILE *f; - - if (therms) - { - ecore_list_destroy(therms); - therms = NULL; - } - - f = fopen("/sys/devices/temperatures/cpu_temperature", "rb"); - if (f) fclose(f); - - if (!f) + /* TODO: Notify user which thermal system is in use */ + /* TODO: Let the user choose the wanted thermal system */ + char *name; + int n = 0; + + of = e_widget_framelist_add(evas, _("Sensors"), 0); + rg = e_widget_radio_group_new(&(cfdata->sensor)); + ecore_list_goto_first(cfdata->sensors); + while ((name = ecore_list_next(cfdata->sensors))) { - therms = ecore_file_ls("/sys/bus/i2c/devices"); - if ((therms) && (!ecore_list_is_empty(therms))) - { - of = e_widget_framelist_add(evas, _("Sensors"), 0); - rg = e_widget_radio_group_new(&(cfdata->sensor)); - ob = e_widget_radio_add(evas, _("Temp 1"), 0, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Temp 2"), 1, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Temp 3"), 2, rg); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - } - if (therms) ecore_list_destroy(therms); - } - } - else - { - of = e_widget_framelist_add(evas, _("ACPI Temperature"), 0); - rg = e_widget_radio_group_new(&(cfdata->acpizone)); - char *tzone; - int n = 0; - while ((tzone = ecore_list_next(therms))) - { - ob = e_widget_radio_add(evas, _(tzone), n, rg); + ob = e_widget_radio_add(evas, _(name), n, rg); e_widget_framelist_object_append(of, ob); n++; } e_widget_list_object_append(o, of, 1, 1, 0.5); - ecore_list_destroy(therms); } -#endif of = e_widget_framelist_add(evas, _("Check Interval"), 0); ob = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.5, 1000.0, 0.5, 0, &(cfdata->poll_time), NULL, 200); @@ -378,10 +362,6 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - int n = 0; - Ecore_List *therms; - char *tzone; - if (cfdata->unit_method != temperature_config->units) { if (cfdata->unit_method == 0) @@ -404,36 +384,12 @@ temperature_config->high = cfdata->high_temp; if (temperature_config->sensor_name) evas_stringshare_del(temperature_config->sensor_name); - temperature_config->sensor_name = NULL; - switch (cfdata->sensor) - { - case 0: - temperature_config->sensor_name = evas_stringshare_add("temp1"); - break; - case 1: - temperature_config->sensor_name = evas_stringshare_add("temp2"); - break; - case 2: - temperature_config->sensor_name = evas_stringshare_add("temp3"); - break; - } - if (temperature_config->acpi_sel) - evas_stringshare_del(temperature_config->acpi_sel); - temperature_config->acpi_sel = NULL; - therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if (therms) - { - while ((tzone = ecore_list_next(therms))) - { - if (n == cfdata->acpizone) - { - temperature_config->acpi_sel = evas_stringshare_add(tzone); - break; - } - n++; - } - ecore_list_destroy(therms); - } + temperature_config->sensor_name = + evas_stringshare_add(ecore_list_goto_index(cfdata->sensors, cfdata->sensor)); + if (temperature_config->sensor_path) + evas_stringshare_del(temperature_config->sensor_path); + temperature_config->sensor_path = NULL; + _temperature_face_cb_config_updated(); e_config_save_queue(); return 1; =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- e_mod_main.c 14 Dec 2006 15:07:47 -0000 1.72 +++ e_mod_main.c 15 Dec 2006 08:32:31 -0000 1.73 @@ -44,7 +44,8 @@ static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _menu_cb_post(void *data, E_Menu *m); -static int _temperature_cb_check(void *data); +static void _temperature_sensor_init(void); +static int _temperature_cb_check(void *data); static void _temperature_face_level_set(Instance *inst, double level); static void _temperature_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); @@ -169,138 +170,249 @@ temperature_config->menu = NULL; } -static int -_temperature_cb_check(void *data) +static void +_temperature_sensor_init(void) { - int ret = 0; - Instance *inst; Ecore_List *therms; - Evas_List *l; - int temp = 0; - char buf[4096]; + char path[PATH_MAX]; #ifdef __FreeBSD__ - static int mib[5] = {-1}; - int len; + int len; #endif -#ifdef __FreeBSD__ - if (mib[0] == -1) + if ((!temperature_config->sensor_type) || (!temperature_config->sensor_name)) { - len = 5; - sysctlnametomib("hw.acpi.thermal.tz0.temperature", mib, &len); - } - - if (mib[0] != -1) - { - len = sizeof(temp); - if (sysctl(mib, 5, &temp, &len, NULL, 0) != -1) - { - temp = (temp - 2732) / 10; - ret = 1; - } - } + if (temperature_config->sensor_name) evas_stringshare_del(temperature_config->sensor_name); + if (temperature_config->sensor_path) evas_stringshare_del(temperature_config->sensor_path); + temperature_config->sensor_path = NULL; +#ifdef __FreeBSD__ + /* TODO: FreeBSD can also have more temperature sensors! */ + temperature_config->sensor_type = SENSOR_TYPE_FREEBSD; + temperature_config->sensor_name = evas_stringshare_add("tz0"); #else # ifdef HAVE_OMNIBOOK - FILE *f; - char dummy[256]; - - f = fopen("/proc/omnibook/temperature", "r"); - if (f) - { - fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; - if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3) - ret = 1; - fclose(f); - } + /* TODO: This does not have to be a define */ + temperature_config->sensor_type = SENSOR_TYPE_OMNIBOOK; + temperature_config->sensor_name = evas_stringshare_add("dummy"); # else - therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if ((!therms) || ecore_list_is_empty(therms)) - { - FILE *f; + therms = ecore_file_ls("/proc/acpi/thermal_zone"); + if ((therms) && (!ecore_list_is_empty(therms))) + { + char *name; - if (therms) ecore_list_destroy(therms); + name = ecore_list_next(therms); + temperature_config->sensor_type = SENSOR_TYPE_LINUX_ACPI; + temperature_config->sensor_name = evas_stringshare_add(name); - f = fopen("/sys/devices/temperatures/cpu_temperature", "rb"); - if (f) - { - fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; - if (sscanf(buf, "%i", &temp) == 1) - ret = 1; - fclose(f); + ecore_list_destroy(therms); } else { - therms = ecore_file_ls("/sys/bus/i2c/devices"); - if (therms) - { - const char *name, *sensor; + FILE *f; - sensor = temperature_config->sensor_name; - if (!sensor) sensor = "temp1"; + if (therms) ecore_list_destroy(therms); - while ((name = ecore_list_next(therms))) + f = fopen("/sys/devices/temperatures/cpu_temperature", "rb"); + if (f) + { + temperature_config->sensor_type = SENSOR_TYPE_LINUX_MACMINI; + temperature_config->sensor_name = evas_stringshare_add("dummy"); + } + else + { + /* TODO: Is there I2C devices with more than 3 temperature sensors? */ + /* TODO: What to do when there is more than one tempX? */ + therms = ecore_file_ls("/sys/bus/i2c/devices"); + if (therms) { - char fname[1024]; + char *name; - sprintf(fname, "/sys/bus/i2c/devices/%s/%s_input", - name, sensor); - if (ecore_file_exists(fname)) + while ((name = ecore_list_next(therms))) { - FILE *f; + char *sensors[] = { "temp1", "temp2", "temp3" }; + int i; - f = fopen(fname,"r"); - if (f) + for (i = 0; i < 3; i++) { - fgets(buf, sizeof(buf), f); - buf[sizeof(buf) - 1] = 0; - - /* actuallty read the temp */ - if (sscanf(buf, "%i", &temp) == 1) - ret = 1; - /* Hack for temp */ - temp = temp / 1000; - fclose(f); + sprintf(path, "/sys/bus/i2c/devices/%s/%s_input", + name, sensors[i]); + if (ecore_file_exists(path)) + { + temperature_config->sensor_type = SENSOR_TYPE_LINUX_I2C; + temperature_config->sensor_name = evas_stringshare_add(sensors[i]); + break; + } } + if (temperature_config->sensor_type) break; } + ecore_list_destroy(therms); } - ecore_list_destroy(therms); } } } - else +# endif +#endif + if ((temperature_config->sensor_type) && + (temperature_config->sensor_name) && + (!temperature_config->sensor_path)) { - const char *name; - - ret = 0; - name = temperature_config->acpi_sel; - if (!name) name = ecore_list_next(therms); - if (name) + switch (temperature_config->sensor_type) { - char *p, *q; - FILE *f; - snprintf(buf, sizeof(buf), "/proc/acpi/thermal_zone/%s/temperature", name); - f = fopen(buf, "rb"); - if (f) - { - fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; - fclose(f); - p = strchr(buf, ':'); - if (p) - { - p++; - while (*p == ' ') p++; - q = strchr(p, ' '); - if (q) *q = 0; - temp = atoi(p); - ret = 1; - } - } + case SENSOR_TYPE_NONE: + break; + case SENSOR_TYPE_FREEBSD: +#ifdef __FreeBSD__ + snprintf(path, sizeof(path), "hw.acpi.thermal.%s.temperature", + temperature_config->sensor_name); + temperature_config->sensor_path = evas_stringshare_add(path); + + len = 5; + sysctlnametomib(temperature_config->sensor_path, temperature_config->mib, &len); +#endif + break; + case SENSOR_TYPE_OMNIBOOK: + temperature_config->sensor_path = evas_stringshare_add("/proc/omnibook/temperature"); + break; + case SENSOR_TYPE_LINUX_MACMINI: + temperature_config->sensor_path = evas_stringshare_add("/sys/devices/temperatures/cpu_temperature"); + break; + case SENSOR_TYPE_LINUX_I2C: + therms = ecore_file_ls("/sys/bus/i2c/devices"); + if (therms) + { + char *name; + + while ((name = ecore_list_next(therms))) + { + sprintf(path, "/sys/bus/i2c/devices/%s/%s_input", + name, temperature_config->sensor_name); + if (ecore_file_exists(path)) + { + temperature_config->sensor_path = evas_stringshare_add(path); + break; + } + } + ecore_list_destroy(therms); + } + break; + case SENSOR_TYPE_LINUX_ACPI: + snprintf(path, sizeof(path), "/proc/acpi/thermal_zone/%s/temperature", + temperature_config->sensor_name); + temperature_config->sensor_path = evas_stringshare_add(path); + break; } - ecore_list_destroy(therms); } -# endif -#endif - +} + +static int +_temperature_cb_check(void *data) +{ + FILE *f; + int ret = 0; + Instance *inst; + Evas_List *l; + int temp = 0; + char buf[4096]; +#ifdef __FreeBSD__ + int len; +#endif + + _temperature_sensor_init(); + + /* TODO: Make standard parser. Seems to be two types of temperature string: + * - Somename: <temp> C + * - <temp> + */ + switch (temperature_config->sensor_type) + { + case SENSOR_TYPE_NONE: + /* TODO: Slow down timer? */ + break; + case SENSOR_TYPE_FREEBSD: +#ifdef __FreeBSD__ + len = sizeof(temp); + if (sysctl(mib, 5, &temp, &len, NULL, 0) != -1) + { + temp = (temp - 2732) / 10; + ret = 1; + } + else + goto error; +#endif + break; + case SENSOR_TYPE_OMNIBOOK: + f = fopen(temperature_config->sensor_path, "r"); + if (f) + { + char dummy[4096]; + + fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; + if (sscanf(buf, "%s %s %i", dummy, dummy, &temp) == 3) + ret = 1; + else + goto error; + fclose(f); + } + else + goto error; + break; + case SENSOR_TYPE_LINUX_MACMINI: + f = fopen(temperature_config->sensor_path, "rb"); + if (f) + { + fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; + if (sscanf(buf, "%i", &temp) == 1) + ret = 1; + else + goto error; + fclose(f); + } + else + goto error; + break; + case SENSOR_TYPE_LINUX_I2C: + f = fopen(temperature_config->sensor_path, "r"); + if (f) + { + fgets(buf, sizeof(buf), f); + buf[sizeof(buf) - 1] = 0; + + /* actuallty read the temp */ + if (sscanf(buf, "%i", &temp) == 1) + ret = 1; + else + goto error; + /* Hack for temp */ + temp = temp / 1000; + fclose(f); + } + else + goto error; + break; + case SENSOR_TYPE_LINUX_ACPI: + f = fopen(temperature_config->sensor_path, "r"); + if (f) + { + char *p, *q; + fgets(buf, sizeof(buf), f); buf[sizeof(buf) - 1] = 0; + fclose(f); + p = strchr(buf, ':'); + if (p) + { + p++; + while (*p == ' ') p++; + q = strchr(p, ' '); + if (q) *q = 0; + temp = atoi(p); + ret = 1; + } + else + goto error; + } + else + goto error; + break; + } + if (temperature_config->units == FAHRENHEIT) temp = (temp * 9.0 / 5.0) + 32; @@ -351,6 +463,17 @@ } } return 1; + +error: + /* TODO: Error count? Might be a temporary problem */ + /* TODO: Error dialog */ + /* TODO: This should be further up, so that it will affect the gadcon */ + temperature_config->sensor_type = SENSOR_TYPE_NONE; + if (temperature_config->sensor_name) evas_stringshare_del(temperature_config->sensor_name); + temperature_config->sensor_name = NULL; + if (temperature_config->sensor_path) evas_stringshare_del(temperature_config->sensor_path); + temperature_config->sensor_path = NULL; + return 1; } static void @@ -377,8 +500,7 @@ { ecore_timer_del(temperature_config->temperature_check_timer); temperature_config->temperature_check_timer = - ecore_timer_add(temperature_config->poll_time, _temperature_cb_check, - NULL); + ecore_timer_add(temperature_config->poll_time, _temperature_cb_check, NULL); } /***************************************************************************/ @@ -401,9 +523,9 @@ E_CONFIG_VAL(D, T, poll_time, DOUBLE); E_CONFIG_VAL(D, T, low, INT); E_CONFIG_VAL(D, T, high, INT); + E_CONFIG_VAL(D, T, sensor_type, INT); E_CONFIG_VAL(D, T, sensor_name, STR); E_CONFIG_VAL(D, T, units, INT); - E_CONFIG_VAL(D, T, acpi_sel, STR); temperature_config = e_config_domain_load("module.temperature", conf_edd); if (!temperature_config) @@ -412,9 +534,10 @@ temperature_config->poll_time = 10.0; temperature_config->low = 30; temperature_config->high = 80; - temperature_config->sensor_name = evas_stringshare_add("temp1"); + temperature_config->sensor_type = SENSOR_TYPE_NONE; + temperature_config->sensor_name = NULL; + temperature_config->sensor_path = NULL; temperature_config->units = CELCIUS; - temperature_config->acpi_sel = NULL; } E_CONFIG_LIMIT(temperature_config->poll_time, 0.5, 1000.0); E_CONFIG_LIMIT(temperature_config->low, 0, 100); @@ -449,6 +572,8 @@ ecore_timer_del(temperature_config->temperature_check_timer); if (temperature_config->sensor_name) evas_stringshare_del(temperature_config->sensor_name); + if (temperature_config->sensor_path) + evas_stringshare_del(temperature_config->sensor_path); free(temperature_config); temperature_config = NULL; E_CONFIG_DD_FREE(conf_edd); =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_mod_main.h 21 Oct 2006 02:32:14 -0000 1.24 +++ e_mod_main.h 15 Dec 2006 08:32:31 -0000 1.25 @@ -12,13 +12,24 @@ FAHRENHEIT } Unit; +typedef enum _Sensor_Type +{ + SENSOR_TYPE_NONE, + SENSOR_TYPE_FREEBSD, + SENSOR_TYPE_OMNIBOOK, + SENSOR_TYPE_LINUX_MACMINI, + SENSOR_TYPE_LINUX_I2C, + SENSOR_TYPE_LINUX_ACPI +} Sensor_Type; + struct _Config { /* saved * loaded config values */ double poll_time; int low, high; + Sensor_Type sensor_type; const char *sensor_name; - const char *acpi_sel; + const char *sensor_path; Unit units; /* just config state */ E_Module *module; @@ -27,6 +38,9 @@ E_Menu *menu; Ecore_Timer *temperature_check_timer; unsigned char have_temp; +#ifdef __FreeBSD__ + int mib[5]; +#endif }; EAPI extern E_Module_Api e_modapi; |
From: Enlightenment C. <no...@cv...> - 2006-12-16 08:27:47
|
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e.h Log Message: Remove duplicate header. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- e.h 9 Dec 2006 06:28:25 -0000 1.53 +++ e.h 16 Dec 2006 08:27:45 -0000 1.54 @@ -63,7 +63,6 @@ #include <Ecore_File.h> #include <Ecore_X_Atoms.h> #include <Ecore_X_Cursor.h> -#include <Ecore_Desktop.h> #include <Eet.h> #include <Edje.h> |