Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.h e_exebuf.c e_fileman_file.c e_fileman_icon.c
e_fileman_smart.c
Log Message:
Fix warnings.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_actions.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_actions.h 2 Dec 2005 09:08:58 -0000 1.8
+++ e_actions.h 7 Jan 2006 17:54:31 -0000 1.9
@@ -15,7 +15,7 @@
{
E_Object e_obj_inherit;
- char *name;
+ const char *name;
struct {
void (*go) (E_Object *obj, char *params);
void (*go_mouse) (E_Object *obj, char *params,
Ecore_X_Event_Mouse_Button_Down *ev);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_exebuf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_exebuf.c 7 Jan 2006 10:39:45 -0000 1.10
+++ e_exebuf.c 7 Jan 2006 17:54:31 -0000 1.11
@@ -289,7 +289,7 @@
edje_object_part_text_set(bg_object, "label", cmd_buf);
if (icon_object) evas_object_del(icon_object);
- icon_object == NULL;
+ icon_object = NULL;
a = e_app_exe_find(cmd_buf);
if (!a) a = e_app_name_find(cmd_buf);
if (!a) a = e_app_generic_find(cmd_buf);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_fileman_file.c 7 Jan 2006 10:39:45 -0000 1.13
+++ e_fileman_file.c 7 Jan 2006 17:54:31 -0000 1.14
@@ -424,6 +424,7 @@
app);
return 0;
}
+ return 1;
}
/* local subsystem functions */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_fileman_icon.c 7 Jan 2006 10:39:45 -0000 1.26
+++ e_fileman_icon.c 7 Jan 2006 17:54:31 -0000 1.27
@@ -49,12 +49,13 @@
/* local subsystem globals */
static Evas_Smart *e_smart = NULL;
-static pid_t pid = -1;
static Evas_List *thumb_files = NULL;
static Evas_List *event_handlers = NULL;
+/*
static Eet_Data_Descriptor *_e_fm_icon_meta_edd = NULL;
+*/
/* externally accessible functions */
EAPI int
@@ -123,7 +124,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
return sd->file;
}
@@ -242,7 +243,7 @@
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
return edje_object_part_text_get(sd->icon_object, "icon_title");
}
@@ -323,7 +324,7 @@
E_Fm_Icon_Metadata *m;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
m = calloc(1, sizeof(E_Fm_Icon_Metadata));
if (!m) return NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_fileman_smart.c 7 Jan 2006 10:39:45 -0000 1.118
+++ e_fileman_smart.c 7 Jan 2006 17:54:31 -0000 1.119
@@ -872,7 +872,6 @@
_e_fm_file_menu_open(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Fm_Icon *icon;
- char *exe;
E_Fm_Assoc_App *assoc;
Evas_List *l;
icon = data;
@@ -2195,7 +2194,7 @@
else if (ev->button == 3)
{
E_Menu *mn,*mo;
- E_Menu_Item *mi, *mio;
+ E_Menu_Item *mi;
int x, y, w, h;
Evas_List *l;
E_Fm_Assoc_App *assoc;
@@ -2551,20 +2550,20 @@
for (l = sd->files; l; l = l->next)
{
icon = l->data;
- for(i = 0; i < globbuf.gl_pathc; i++)
+ for (i = 0; i < globbuf.gl_pathc; i++)
{
- char *file;
+ const char *file;
file = ecore_file_get_file(globbuf.gl_pathv[i]);
- if(!strcmp(icon->file->name, file))
+ if (!strcmp(icon->file->name, file))
{
_e_fm_selections_add(l->data, l);
e_fm_icon_signal_emit(icon->icon_obj, "default", "");
- if(!anchor)
+ if (!anchor)
{
evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
- if(!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
+ if (!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
{
ev = E_NEW(E_Event_Fm_Reconfigure, 1);
if (ev)
@@ -2582,7 +2581,7 @@
}
}
- if(anchor && ev)
+ if ((anchor) && (ev))
ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
@@ -2609,20 +2608,20 @@
else
l = sd->files;
- for(l; l; l = l->next)
+ for (; l; l = l->next)
{
icon = l->data;
- if(icon->file->name[0] == c[0])
+ if (icon->file->name[0] == c[0])
{
_e_fm_selections_clear(sd);
_e_fm_selections_add(l->data, l);
goto position;
}
}
- for(l = sd->files; l != sd->selection.current.ptr; l = l->next)
+ for (l = sd->files; l != sd->selection.current.ptr; l = l->next)
{
icon = l->data;
- if(icon->file->name[0] == c[0])
+ if (icon->file->name[0] == c[0])
{
_e_fm_selections_clear(sd);
_e_fm_selections_add(l->data, l);
@@ -2636,7 +2635,7 @@
Evas_Coord x, y, w, h;
icon = l->data;
evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
- if(!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
+ if (!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
{
E_Event_Fm_Reconfigure *ev;
@@ -2695,9 +2694,9 @@
{
int flag = 0;
icon = l->data;
- if(flag = icon->state.selected)
+ if (flag = icon->state.selected)
{
- if(l->next->next)
+ if (l->next->next)
icon = l->next->next->data;
else
icon = l->next->data;
@@ -2706,12 +2705,12 @@
_e_fm_selections_del(sd->selection.current.ptr->data);
x2 = x + 1;
}
- for(; l && (x != x2); l = l->prev)
+ for (; l && (x != x2); l = l->prev)
{
icon = l->data;
evas_object_geometry_get(icon->icon_obj, &x2, NULL,
NULL, NULL);
- if(icon->state.selected)
+ if (icon->state.selected)
{
_e_fm_selections_del(l->data);
_e_fm_selections_current_set(l->data, l);
@@ -2719,7 +2718,7 @@
else
_e_fm_selections_add(l->data, l);
}
- if(flag && l)
+ if (flag && l)
_e_fm_selections_current_set(l->data, l);
}
evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
@@ -2745,13 +2744,13 @@
static void
_e_fm_icon_select_down(E_Fm_Smart_Data *sd)
{
- Evas_List *l, *l2;
+ Evas_List *l;
- if(!sd->selection.current.ptr)
+ if (!sd->selection.current.ptr)
_e_fm_selections_add(sd->files->data, sd->files);
else
{
- if(sd->selection.current.ptr->next) /* are we already at the end? */
+ if (sd->selection.current.ptr->next) /* are we already at the end? */
{
E_Fm_Icon *icon;
@@ -3037,10 +3036,10 @@
}
else if (!strcmp(ev->keyname, "BackSpace"))
{
- char *str;
+ const char *str;
str = NULL;
str = edje_object_part_text_get(sd->edje_obj, "text");
- if(str)
+ if (str)
{
char *buf;
int size;
@@ -3052,10 +3051,10 @@
E_FREE(buf);
}
}
- else if (!strcmp(ev->keyname, "Up")
- || !strcmp(ev->keyname, "Down")
- || !strcmp(ev->keyname, "Escape")
- || !strcmp(ev->keyname, "Return"))
+ else if (!strcmp(ev->keyname, "Up") ||
+ !strcmp(ev->keyname, "Down") ||
+ !strcmp(ev->keyname, "Escape") ||
+ !strcmp(ev->keyname, "Return"))
{
edje_object_signal_emit(sd->edje_obj, "typebuf_hide", "");
@@ -3069,10 +3068,10 @@
}
else if (ev->string)
{
- char *str;
+ const char *str;
str = NULL;
str = edje_object_part_text_get(sd->edje_obj, "text");
- if(str)
+ if (str)
{
char *buf;
int size;
@@ -3090,7 +3089,7 @@
}
}
}
- else if (!strcmp(ev->keyname, "Up"))
+ else if (!strcmp(ev->keyname, "Up"))
{
_e_fm_icon_select_up(sd);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
