Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.h e_eap_editor.c e_editable.c e_entry.c e_exebuf.c
e_fm.c e_gadcon.c e_int_config_apps.c
e_int_config_icon_themes.c e_int_config_mousebindings.c
e_int_config_startup.c e_int_config_theme_import.c
e_int_menus.c
Log Message:
Cleanup.
- Remove unused variables.
- Add const where needed.
- Add return values.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_config.h 19 Sep 2006 13:58:04 -0000 1.121
+++ e_config.h 21 Sep 2006 19:53:37 -0000 1.122
@@ -364,8 +364,8 @@
struct _E_Config_Mime_Icon
{
- char *mime;
- char *icon;
+ const char *mime;
+ const char *icon;
};
EAPI int e_config_init(void);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- e_eap_editor.c 18 Sep 2006 20:52:59 -0000 1.57
+++ e_eap_editor.c 21 Sep 2006 19:53:38 -0000 1.58
@@ -60,7 +60,7 @@
E_Config_Dialog_View *v;
E_App_Edit *editor;
- if (!con) return;
+ if (!con) return NULL;
editor = E_OBJECT_ALLOC(E_App_Edit, E_EAP_EDIT_TYPE, _e_eap_edit_free);
if (!editor) return NULL;
@@ -273,7 +273,7 @@
{
E_App_Edit *editor;
E_App *eap;
- Evas_Object *ol, *o, *mt;
+ Evas_Object *ol, *o;
Evas_Object *entry;
editor = data->editor;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_editable.c 30 Aug 2006 20:53:29 -0000 1.14
+++ e_editable.c 21 Sep 2006 19:53:38 -0000 1.15
@@ -908,7 +908,7 @@
E_Editable_Smart_Data *sd;
Evas_Object *text_obj;
Evas_Coord tx, ty;
- Evas_Coord cx, cy, cw, ch;
+ Evas_Coord cx, cy, ch;
if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
return;
@@ -939,7 +939,7 @@
E_Editable_Smart_Data *sd;
Evas_Object *text_obj;
Evas_Coord tx, ty;
- Evas_Coord cx, cy, cw, ch;
+ Evas_Coord cx, cy;
Evas_Coord sx, sy, sw, sh;
int start_pos, end_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_entry.c 23 Aug 2006 13:39:46 -0000 1.31
+++ e_entry.c 21 Sep 2006 19:53:38 -0000 1.32
@@ -383,7 +383,6 @@
Evas_Object *entry;
E_Entry_Smart_Data *sd;
Ecore_X_Event_Selection_Notify *ev;
- Ecore_X_Selection_Data *selection_data;
Evas_Object *editable;
int cursor_pos, selection_pos;
int start_pos, end_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_exebuf.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_exebuf.c 19 Sep 2006 13:58:04 -0000 1.23
+++ e_exebuf.c 21 Sep 2006 19:53:38 -0000 1.24
@@ -432,7 +432,7 @@
_e_exebuf_exec_term(void)
{
char tmp[EXEBUFLEN];
- char *active_cmd;
+ const char *active_cmd;
if (exe_sel)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_fm.c 19 Sep 2006 13:58:04 -0000 1.71
+++ e_fm.c 21 Sep 2006 19:53:38 -0000 1.72
@@ -160,7 +160,7 @@
static void _e_fm2_typebuf_run(Evas_Object *obj);
static void _e_fm2_typebuf_match(Evas_Object *obj);
static void _e_fm2_typebuf_complete(Evas_Object *obj);
-static void _e_fm2_typebuf_char_append(Evas_Object *obj, char *ch);
+static void _e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch);
static void _e_fm2_typebuf_char_backspace(Evas_Object *obj);
static void _e_fm2_cb_dnd_enter(void *data, const char *type, void *event);
@@ -1855,7 +1855,7 @@
static int
_e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
{
- char buf[4096], key[256], val[4096];
+ char buf[4096];
Ecore_Desktop *desktop;
if (ic->info.pseudo_link)
@@ -2289,7 +2289,7 @@
}
static void
-_e_fm2_typebuf_char_append(Evas_Object *obj, char *ch)
+_e_fm2_typebuf_char_append(Evas_Object *obj, const char *ch)
{
E_Fm2_Smart_Data *sd;
char *ts;
@@ -2343,7 +2343,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_into_hide(Evas_Object *obj)
+_e_fm2_dnd_drop_into_hide(E_Fm2_Icon *ic)
{
}
@@ -2355,7 +2355,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_between_hide(Evas_Object *obj)
+_e_fm2_dnd_drop_between_hide(E_Fm2_Icon *ic)
{
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_gadcon.c 18 Sep 2006 03:49:44 -0000 1.46
+++ e_gadcon.c 21 Sep 2006 19:53:38 -0000 1.47
@@ -57,7 +57,6 @@
static void _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc);
static void _e_gadcon_layout_smart_sync_clients(E_Gadcon *gc);
static void _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data
*sd);
-static void _e_gadcon_layout_smart_gadcon_clients_save(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data
*sd);
static Evas_List *_e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd);
static void _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd,
Evas_List **list);
@@ -1005,8 +1004,7 @@
_e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadcon_Client *gcc;
- E_Gadcon *gc;
-
+
gcc = data;
e_gadcon_layout_freeze(gcc->gadcon->o_container);
if (gcc->autoscroll) gcc->autoscroll = 0;
@@ -2338,8 +2336,8 @@
static void
_e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
{
- Evas_Coord x, y, w, h, xx, yy;
- Evas_List *l, *l2;
+ Evas_Coord xx, yy;
+ Evas_List *l;
int min, mino, cur;
Evas_List *list = NULL;
E_Gadcon_Layout_Item *bi;
@@ -2766,7 +2764,6 @@
_e_gadcon_layout_smart_width_smart_sort_reverse_cb(void *d1, void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
- int v1, v2;
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
@@ -3201,7 +3198,6 @@
{
E_Gadcon_Layout_Item *bi;
Evas_List *l;
- int xx, yy;
for (l = sd->items; l; l = l->next)
{
@@ -3637,7 +3633,7 @@
if (!l2) l2 = *list;
else l2 = l2->next;
- for (l2; l2 != l; l2 = l2->next)
+ for (; l2 != l; l2 = l2->next)
{
lc = l2->data;
lc->pos = new_pos;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_apps.c 15 Sep 2006 17:44:23 -0000 1.26
+++ e_int_config_apps.c 21 Sep 2006 19:53:38 -0000 1.27
@@ -399,7 +399,6 @@
E_Fm2_Icon_Info *ici;
const char *realpath;
char buf[4096];
- E_App *a, *parent;
cfdata = data1;
if (!cfdata->gui.o_fm_all) return;
@@ -498,10 +497,8 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
struct _E_Config_Once *once = NULL;
- Evas_Object *o, *of, *ob, *ot, *ilist, *mt;
- Evas_List *l;
+ Evas_Object *o, *of, *ob, *ot, *mt;
E_Fm2_Config fmc_all, fmc;
- int i;
if (cfdata->cfd->data)
once = cfdata->cfd->data;
@@ -674,7 +671,6 @@
{
char buf[4096];
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
@@ -734,7 +730,6 @@
{
char buf[4096], *last;
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
@@ -805,7 +800,6 @@
{
char buf[4096];
Evas_List *list = NULL, *l;
- int ret = 0;
FILE *f;
snprintf(buf, sizeof(buf), "%s/.order", order);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_icon_themes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_config_icon_themes.c 30 Aug 2006 14:45:33 -0000 1.9
+++ e_int_config_icon_themes.c 21 Sep 2006 19:53:38 -0000 1.10
@@ -272,7 +272,6 @@
{
Evas_Object *o, *ilist;
Evas_List *l;
- E_Fm2_Config fmc;
int i;
o = e_widget_list_add(evas, 1, 0);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mousebindings.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_mousebindings.c 31 Aug 2006 04:16:43 -0000 1.3
+++ e_int_config_mousebindings.c 21 Sep 2006 19:53:38 -0000 1.4
@@ -445,7 +445,6 @@
{
char *n;
const char *action;
- int i;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
@@ -669,7 +668,6 @@
static void
_update_binding_context(E_Config_Dialog_Data *cfdata)
{
- int found = 0;
char *n;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
@@ -845,7 +843,6 @@
static void
_binding_change_cb(void *data)
{
- char *n;
E_Config_Dialog_Data *cfdata;
cfdata = data;
@@ -853,7 +850,7 @@
_auto_apply_changes(cfdata);
if (cfdata->locals.cur) free(cfdata->locals.cur);
- cfdata->locals.cur == NULL;
+ cfdata->locals.cur = NULL;
if (cfdata->locals.binding[0])
cfdata->locals.cur = strdup(cfdata->locals.binding);
@@ -1000,7 +997,6 @@
static void
_restore_default_cb(void *data, void *data2)
{
- Evas_List *l;
E_Config_Binding_Mouse *eb;
E_Config_Binding_Wheel *bw;
E_Config_Dialog_Data *cfdata;
@@ -1101,10 +1097,9 @@
static int
_grab_mouse_down_cb(void *data, int type, void *event)
{
- Evas_List *l;
E_Config_Dialog_Data *cfdata;
E_Config_Binding_Mouse *eb;
- int mod = E_BINDING_MODIFIER_NONE, found = 0;
+ int mod = E_BINDING_MODIFIER_NONE;
Ecore_X_Event_Mouse_Button_Down *ev = event;
cfdata = data;
@@ -1152,11 +1147,10 @@
}
static int _grab_mouse_wheel_cb(void *data, int type, void *event)
{
- Evas_List *l;
E_Config_Binding_Wheel *bw;
E_Config_Dialog_Data *cfdata;
Ecore_X_Event_Mouse_Wheel *ev = event;
- int mod = E_BINDING_MODIFIER_NONE, found = 0;
+ int mod = E_BINDING_MODIFIER_NONE;
cfdata = data;
@@ -1223,6 +1217,7 @@
{
_grab_wnd_hide_cb(cfdata);
}
+ return 1;
}
static void
_grab_wnd_hide_cb(E_Config_Dialog_Data *cfdata)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_startup.c 30 Aug 2006 14:45:33 -0000 1.18
+++ e_int_config_startup.c 21 Sep 2006 19:53:38 -0000 1.19
@@ -4,7 +4,6 @@
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 _load_inits(E_Config_Dialog *cfd, Evas_Object *il);
void _ilist_cb_init_selected(void *data);
struct _E_Config_Dialog_Data
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_theme_import.c 2 Sep 2006 10:39:28 -0000 1.6
+++ e_int_config_theme_import.c 21 Sep 2006 19:53:38 -0000 1.7
@@ -240,8 +240,7 @@
const char *file;
char *homedir;
char buf[4096];
- int is_theme;
-
+
win = data;
import = win->data;
if (!import) return;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- e_int_menus.c 18 Sep 2006 14:07:16 -0000 1.162
+++ e_int_menus.c 21 Sep 2006 19:53:38 -0000 1.163
@@ -570,7 +570,6 @@
E_Drag *drag;
Evas_Object *o = NULL;
Evas_Coord x, y, w, h;
- const char *file = NULL, *part = NULL;
const char *drag_types[] = { "enlightenment/eapp" };
evas_object_geometry_get(mi->icon_object,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
