Fix warnings.

SVN revision: 19617
This commit is contained in:
sebastid 2006-01-07 17:54:31 +00:00 committed by sebastid
parent 60cf81f63e
commit e5461c66c6
5 changed files with 37 additions and 36 deletions

View File

@ -15,7 +15,7 @@ struct _E_Action
{
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);

View File

@ -289,7 +289,7 @@ _e_exebuf_update(void)
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);

View File

@ -424,6 +424,7 @@ e_fm_file_exec_with(E_Fm_File *file, char* exec_with)
app);
return 0;
}
return 1;
}
/* local subsystem functions */

View File

@ -49,12 +49,13 @@ static void _e_fm_icon_meta_fill(E_Fm_Icon_Metadata *m, E_Smart_Data *sd);
/* 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_fm_icon_file_get(Evas_Object *obj)
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_fm_icon_title_get(Evas_Object *obj)
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_meta_generate(Evas_Object *obj)
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;

View File

@ -872,7 +872,6 @@ static void
_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 @@ _e_fm_icon_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
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;
@ -2553,7 +2552,7 @@ _e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
icon = l->data;
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))
@ -2582,7 +2581,7 @@ _e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
}
}
if(anchor && ev)
if ((anchor) && (ev))
ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
}
@ -2609,7 +2608,7 @@ static void
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])
@ -2745,7 +2744,7 @@ _e_fm_icon_select_up(E_Fm_Smart_Data *sd)
static void
_e_fm_icon_select_down(E_Fm_Smart_Data *sd)
{
Evas_List *l, *l2;
Evas_List *l;
if (!sd->selection.current.ptr)
_e_fm_selections_add(sd->files->data, sd->files);
@ -3037,7 +3036,7 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
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)
@ -3052,10 +3051,10 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
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,7 +3068,7 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
else if (ev->string)
{
char *str;
const char *str;
str = NULL;
str = edje_object_part_text_get(sd->edje_obj, "text");
if (str)