Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_eap_editor.c e_entry.c e_file_dialog.c
e_fileman_file.c e_fileman_icon.c e_fileman_smart.c e_thumb.c
e_widget_entry.c e_widget_iconsel.c
Log Message:
- fix warnings
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_apps.c 31 Oct 2005 00:01:54 -0000 1.99
+++ e_apps.c 31 Oct 2005 09:31:04 -0000 1.100
@@ -1077,7 +1077,7 @@
Evas *evasbuf;
Evas_Coord iw, ih;
Evas_Object *im;
- int *data;
+ const int *data;
buf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(buf);
@@ -1095,7 +1095,7 @@
evas_object_move(im, 0, 0);
evas_object_show(im);
data = ecore_evas_buffer_pixels_get(buf);
- eet_data_image_write(ef, "images/0", data, 48, 48, alpha, 1, 0, 0);
+ eet_data_image_write(ef, "images/0", (void *)data, 48, 48, alpha,
1, 0, 0);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_eap_editor.c 31 Oct 2005 00:01:54 -0000 1.9
+++ e_eap_editor.c 31 Oct 2005 09:31:04 -0000 1.10
@@ -227,7 +227,7 @@
}
editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
- &cfdata->image);
+ &(cfdata->image));
e_widget_iconsel_select_callback_add(editor->img_widget,
_e_eap_edit_select_cb, editor);
e_widget_frametable_object_append(o, editor->img_widget,
0, 0, 1, 1,
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_entry.c 28 Oct 2005 02:56:26 -0000 1.11
+++ e_entry.c 31 Oct 2005 09:31:04 -0000 1.12
@@ -769,7 +769,7 @@
if(key_event->string && strcmp(key_event->keyname, "Escape"))
{
if(*(key_event->string) >= 32 && *(key_event->string) <= 126)
- e_entry_sd->change_func(e_entry_sd->change_data, obj,
key_event->string);
+ e_entry_sd->change_func(e_entry_sd->change_data, obj, (char
*)key_event->string);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_file_dialog.c 31 Oct 2005 00:01:54 -0000 1.3
+++ e_file_dialog.c 31 Oct 2005 09:31:04 -0000 1.4
@@ -65,7 +65,7 @@
table = e_widget_table_add(evas, "Select File", 0);
- fm = e_widget_fileman_add(evas, dia->file);
+ fm = e_widget_fileman_add(evas, &(dia->file));
e_widget_table_object_append(table, fm, 0, 0, 4, 4, 1, 1, 1, 1);
e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb,
dia);
@@ -90,7 +90,7 @@
void
e_file_dialog_title_set(E_File_Dialog *dia, const char *title)
{
- e_dialog_title_set(dia->dia, title);
+ e_dialog_title_set(dia->dia, (char *)title);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_file.c 29 Oct 2005 14:19:23 -0000 1.10
+++ e_fileman_file.c 31 Oct 2005 09:31:04 -0000 1.11
@@ -62,7 +62,7 @@
if (!file) return NULL;
file->path = strdup(filename);
if (!file->path) goto error;
- file->name = strdup(ecore_file_get_file(filename));
+ file->name = strdup(ecore_file_get_file((char *)filename));
if (!file->name) goto error;
/* Get attributes */
file->device = st.st_dev;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_icon.c 29 Oct 2005 11:48:18 -0000 1.10
+++ e_fileman_icon.c 31 Oct 2005 09:31:04 -0000 1.11
@@ -162,7 +162,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
E_FREE(sd->saved_title);
- sd->saved_title = E_NEW(char *, strlen(title) + 1);
+ sd->saved_title = E_NEW(char, strlen(title) + 1);
snprintf(sd->saved_title, strlen(title) + 1, "%s", title);
if (sd->icon_object) edje_object_part_text_set(sd->icon_object,
"icon_title", title);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_fileman_smart.c 30 Oct 2005 08:40:37 -0000 1.66
+++ e_fileman_smart.c 31 Oct 2005 09:31:04 -0000 1.67
@@ -329,7 +329,7 @@
E_Fm_Smart_Data *sd;
sd = evas_object_smart_data_get(object);
- if (!sd) return NULL;
+ if (!sd) return;
if (x > (sd->child.w - sd->w)) x = sd->child.w - sd->w;
if (y > (sd->child.h - sd->h)) y = sd->child.h - sd->h;
@@ -352,7 +352,7 @@
E_Fm_Smart_Data *sd;
sd = evas_object_smart_data_get(object);
- if (!sd) return NULL;
+ if (!sd) return;
if (x)
{
@@ -373,7 +373,7 @@
E_Fm_Smart_Data *sd;
sd = evas_object_smart_data_get(object);
- if (!sd) return NULL;
+ if (!sd) return;
if (x) *x = sd->child.x;
if (y) *y = sd->child.y;
@@ -757,7 +757,7 @@
icon->sd->files = evas_list_remove(icon->sd->files, icon);
e_icon_layout_freeze(icon->sd->layout);
- e_icon_layout_unpack(icon);
+ e_icon_layout_unpack(icon->icon_object);
e_icon_layout_thaw(icon->sd->layout);
_e_fm_redraw(icon->sd);
_e_fm_file_free(icon);
@@ -1300,6 +1300,7 @@
{
Evas_List *l;
E_Event_Fm_Reconfigure *ev;
+ E_Event_Fm_Directory_Change *ev2;
if (!dir) return;
if ((sd->dir) && (!strcmp(sd->dir, dir))) return;
@@ -1372,13 +1373,13 @@
_e_fm_redraw(sd);
/* raise dir change event */
- ev = E_NEW(E_Event_Fm_Directory_Change, 1);
- if (ev)
+ ev2 = E_NEW(E_Event_Fm_Directory_Change, 1);
+ if (ev2)
{
- ev->object = sd->object;
- ev->w = sd->child.w;
- ev->h = sd->child.h;
- ecore_event_add(E_EVENT_FM_DIRECTORY_CHANGE, ev, NULL, NULL);
+ ev2->object = sd->object;
+ ev2->w = sd->child.w;
+ ev2->h = sd->child.h;
+ ecore_event_add(E_EVENT_FM_DIRECTORY_CHANGE, ev2, NULL, NULL);
}
if (sd->frozen)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_thumb.c 23 Oct 2005 15:18:47 -0000 1.11
+++ e_thumb.c 31 Oct 2005 09:31:04 -0000 1.12
@@ -110,18 +110,18 @@
evas_object_move(*im, 0, 0);
evas_object_show(*im);
- return ecore_evas_buffer_pixels_get(*buf);
+ return (int *)ecore_evas_buffer_pixels_get(*buf);
}
return NULL;
}
/* thumbnail an e17 background and return pixel data */
-int *
+const int *
_e_thumb_ebg_create(char *file, Evas_Coord w, Evas_Coord h, int *ww, int *hh,
int *alpha, Evas_Object **im, Ecore_Evas **buf)
{
Evas *evasbuf;
Evas_Object *wallpaper;
- int *pixels;
+ const int *pixels;
*ww = 640;
*hh = 480;
@@ -150,12 +150,12 @@
}
/* thumbnail an e17 theme and return pixel data */
-int *
+const int *
_e_thumb_etheme_create(char *file, Evas_Coord w, Evas_Coord h, int *ww, int
*hh, int *alpha, Evas_Object **im, Ecore_Evas **buf)
{
Evas *evasbuf;
Evas_Object *wallpaper, *window, *clock, *start, **pager;
- int *pixels;
+ const int *pixels;
*ww = 640;
*hh = 480;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_entry.c 26 Oct 2005 20:41:06 -0000 1.3
+++ e_widget_entry.c 31 Oct 2005 09:31:05 -0000 1.4
@@ -19,7 +19,7 @@
static void _e_wid_disable_hook(Evas_Object *obj);
static void _e_wid_signal_cb1(void *data, Evas_Object *obj, const char
*emission, const char *source);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static int _e_wid_text_change(void *data, Evas_Object *entry, char *key);
+static void _e_wid_text_change(void *data, Evas_Object *entry, char *key);
/* local subsystem functions */
@@ -110,7 +110,7 @@
e_widget_focus_steal(data);
}
-static int
+static void
_e_wid_text_change(void *data, Evas_Object *entry, char *key)
{
E_Widget_Data *wd;
@@ -130,7 +130,6 @@
*(wd->valptr) = realloc(*(wd->valptr), size);
strcat(*(wd->valptr), key);
}
- return 1;
}
/* externally accessible functions */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_iconsel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_iconsel.c 28 Oct 2005 23:37:14 -0000 1.3
+++ e_widget_iconsel.c 31 Oct 2005 09:31:05 -0000 1.4
@@ -122,7 +122,6 @@
o = edje_object_add(evas);
wd->o_icon = o;
e_util_edje_icon_set(o, icon);
- evas_object_pass_events_set(icon, 1);
edje_object_part_swallow(wd->o_button, "icon_swallow", o);
edje_object_signal_emit(wd->o_button, "icon_visible", "");
edje_object_message_signal_process(wd->o_button);
@@ -208,7 +207,7 @@
e_icon_file_set(wd->o_icon, file);
E_FREE(*(wd->valptr));
*(wd->valptr) = strdup(file);
- e_object_del(fileman);
+ e_object_del(E_OBJECT(fileman));
}
@@ -259,5 +258,5 @@
e_icon_file_set(wd->o_icon, file);
E_FREE(*(wd->valptr));
*(wd->valptr) = strdup(file);
- e_object_del(dia);
+ e_object_del(E_OBJECT(dia));
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
