take that - more warning--

SVN revision: 47098
This commit is contained in:
Carsten Haitzler 2010-03-10 04:13:34 +00:00
parent 310810413c
commit 23d121c6e7
20 changed files with 51 additions and 78 deletions

View File

@ -102,7 +102,7 @@ handle_run(int fd, unsigned long bytes)
close(fd);
argc = ((unsigned long *)(buf))[0];
argv = (char **)(&(((unsigned long *)(buf))[1]));
for (i = 0; i < argc; i++) argv[i] = buf + (unsigned long)argv[i];
for (i = 0; i < argc; i++) argv[i] = (char *)(buf + (unsigned long)argv[i]);
cwd = argv[argc - 1] + strlen(argv[argc - 1]) + 1;
elm_quicklaunch_prepare(argc, argv);
elm_quicklaunch_fork(argc, argv, cwd, post_fork, NULL);
@ -271,7 +271,6 @@ main(int argc, char **argv)
if (fd >= 0)
{
unsigned long bytes;
char line[4096];
int num;
num = read(fd, &bytes, sizeof(unsigned long));

View File

@ -67,7 +67,7 @@ main(int argc, char **argv)
int exelen = strlen(argv[0]);
if (path)
{
const char *p, *pp, *s;
const char *p, *pp;
p = path;
pp = p;
@ -149,11 +149,12 @@ main(int argc, char **argv)
{
((unsigned long *)(sbuf))[2 + i] =
(unsigned long)pos - ((unsigned long)sbuf + sizeof(unsigned long));
strcpy(pos, sargv[i]);
strcpy((char *)pos, sargv[i]);
pos += strlen(sargv[i]) + 1;
}
strcpy(pos, cwd);
write(sock, sbuf, slen);
strcpy((char *)pos, cwd);
if (write(sock, sbuf, slen) < 0)
printf("elementary_quicklaunch: cannot write to socket '%s'\n", buf);
close(sock);
return 0;
}

View File

@ -71,7 +71,6 @@ void
test_anchorview(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *av;
char buf[PATH_MAX];
win = elm_win_add(NULL, "anchorview", ELM_WIN_BASIC);
elm_win_title_set(win, "Anchorview");

View File

@ -4,7 +4,6 @@ void
test_carousel(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg;
char buf[PATH_MAX];
win = elm_win_add(NULL, "carousel", ELM_WIN_BASIC);
elm_win_title_set(win, "Carousel");

View File

@ -46,7 +46,6 @@ void
test_fileselector(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *fs, *bg, *vbox, *hbox, *bt;
char buf[PATH_MAX];
/* Set the locale according to the system pref.
* If you dont do so the file selector will order the files list in

View File

@ -63,7 +63,6 @@ void
test_floating(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *gl;
Evas_Object *over;
Elm_Genlist_Item *gli;
int i;
Ecore_Animator *ani;

View File

@ -311,7 +311,6 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
Evas_Object *win, *bg, *gl, *bx, *bx2, *bx3, *bt;
Elm_Genlist_Item *gli[10];
char buf[PATH_MAX];
int i;
win = elm_win_add(NULL, "genlist-2", ELM_WIN_BASIC);
elm_win_title_set(win, "Genlist 2");
@ -531,7 +530,6 @@ test_genlist3(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
static Testitem tit[3];
int i;
win = elm_win_add(NULL, "genlist-3", ELM_WIN_BASIC);
elm_win_title_set(win, "Genlist 3");
@ -686,7 +684,6 @@ test_genlist4(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
static Testitem tit[3];
int i;
win = elm_win_add(NULL, "genlist-4", ELM_WIN_BASIC);
elm_win_title_set(win, "Genlist 4");
@ -883,7 +880,6 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
static Testitem tit[3];
int i;
win = elm_win_add(NULL, "genlist-5", ELM_WIN_BASIC);
elm_win_title_set(win, "Genlist 5");

View File

@ -9,7 +9,7 @@ icon_clicked(void *data, Evas_Object *obj, void *event_info)
void
test_icon(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *ic;
Evas_Object *win, *ic;
char buf[PATH_MAX];
win = elm_win_add(NULL, "icon-transparent", ELM_WIN_BASIC);

View File

@ -4,7 +4,6 @@ void
test_inwin(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *inwin, *lb;
char buf[PATH_MAX];
win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
elm_win_title_set(win, "Inwin");
@ -36,7 +35,6 @@ void
test_inwin2(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *inwin, *lb;
char buf[PATH_MAX];
win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
elm_win_title_set(win, "Inwin");

View File

@ -56,7 +56,6 @@ smooth_cb(void *data, Evas_Object *obj, void *event_info)
static void
close_cb(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
evas_object_del(data);
}

View File

@ -9,7 +9,7 @@ static void
_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Mouse_Down *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
if (ev->button != 1) return;
printf("MOUSE: down @ %4i %4i\n", ev->canvas.x, ev->canvas.y);
@ -22,7 +22,7 @@ static void
_mouse_up(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Mouse_Up *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
if (ev->button != 1) return;
printf("MOUSE: up @ %4i %4i\n", ev->canvas.x, ev->canvas.y);
evas_object_hide(indicator[0]);
@ -32,7 +32,7 @@ static void
_mouse_move(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Mouse_Move *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
printf("MOUSE: move @ %4i %4i\n", ev->cur.canvas.x, ev->cur.canvas.y);
evas_object_move(indicator[0], ev->cur.canvas.x, ev->cur.canvas.y);
evas_object_resize(indicator[0], 1, 1);
@ -45,7 +45,7 @@ static void
_multi_down(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Multi_Down *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
printf("MULTI: down @ %4i %4i | dev: %i\n", ev->canvas.x, ev->canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_move(indicator[ev->device], ev->canvas.x, ev->canvas.y);
@ -57,7 +57,7 @@ static void
_multi_up(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Multi_Up *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
printf("MULTI: up @ %4i %4i | dev: %i\n", ev->canvas.x, ev->canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_hide(indicator[ev->device]);
@ -67,7 +67,7 @@ static void
_multi_move(void *data, Evas *e, Evas_Object *o, void *event_info)
{
Evas_Event_Multi_Move *ev = event_info;
Evas_Object *win = data;
// Evas_Object *win = data;
printf("MULTI: move @ %4i %4i | dev: %i\n", ev->cur.canvas.x, ev->cur.canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_move(indicator[ev->device], ev->cur.canvas.x, ev->cur.canvas.y);

View File

@ -3,26 +3,25 @@
static void
my_notepad_bt_1(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *np = data;
// Evas_Object *np = data;
}
static void
my_notepad_bt_2(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *np = data;
// Evas_Object *np = data;
}
static void
my_notepad_bt_3(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *np = data;
// Evas_Object *np = data;
}
void
test_notepad(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *bx2, *bt, *ic, *np;
char buf[PATH_MAX];
win = elm_win_add(NULL, "notepad", ELM_WIN_BASIC);
elm_win_title_set(win, "Notepad");

View File

@ -39,7 +39,6 @@ void
test_pager(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *pg, *bx, *lb, *bt;
char buf[PATH_MAX];
static Pginfo info;
win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);

View File

@ -100,7 +100,6 @@ _fill_list(Evas_Object *obj)
{
DIR *d;
struct dirent *de;
char buff[PATH_MAX];
Eina_List *dirs = NULL, *l;
char *real;
@ -141,7 +140,6 @@ _dir_has_subs(const char *path)
{
DIR *d;
struct dirent *de;
char buff[PATH_MAX];
Eina_Bool result = EINA_FALSE;
if (!path) return result;

View File

@ -6,112 +6,112 @@ static Evas_Object *rect;
static void
my_ph_clicked(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("clicked\n");
}
static void
my_ph_press(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("press\n");
}
static void
my_ph_longpressed(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("longpressed\n");
}
static void
my_ph_clicked_double(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("clicked,double\n");
}
static void
my_ph_load(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("load\n");
}
static void
my_ph_loaded(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("loaded\n");
}
static void
my_ph_load_details(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("load,details\n");
}
static void
my_ph_loaded_details(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("loaded,details\n");
}
static void
my_ph_zoom_start(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("zoom,start\n");
}
static void
my_ph_zoom_stop(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("zoom,stop\n");
}
static void
my_ph_zoom_change(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("zoom,change\n");
}
static void
my_ph_anim_start(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("anim,start\n");
}
static void
my_ph_anim_stop(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("anim,stop\n");
}
static void
my_ph_drag_start(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("drag,start\n");
}
static void
my_ph_drag_stop(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
printf("drag_stop\n");
}
static void
my_ph_scroll(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
int x, y, w, h;
elm_photocam_region_get(obj, &x, &y, &w, &h);
printf("scroll %i %i %ix%i\n", x, y, w, h);
@ -207,7 +207,6 @@ static void
_photocam_mouse_wheel_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Object *photocam = data;
Evas_Object *ph = data;
Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel*) event_info;
int zoom;
double val;
@ -248,7 +247,6 @@ void
test_photocam(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *ph, *tb2, *bt;
char buf[PATH_MAX];
// these were just testing - use the "select photo" browser to select one
const char *img[5] =
{

View File

@ -68,7 +68,7 @@ my_progressbar_destroy(void *data, Evas_Object *obj, void *event_info)
void
test_progressbar(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *pb, *bx, *pbx, *hbx, *bt, *bt_bx, *ic1, *ic2;
Evas_Object *win, *bg, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2;
char buf[PATH_MAX];
win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);

View File

@ -4,7 +4,6 @@ void
test_scaling(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *bt;
char buf[PATH_MAX];
win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC);
elm_win_title_set(win, "Scaling");
@ -64,7 +63,6 @@ void
test_scaling2(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *fr, *lb;
char buf[PATH_MAX];
win = elm_win_add(NULL, "scaling-2", ELM_WIN_BASIC);
elm_win_title_set(win, "Scaling 2");

View File

@ -4,7 +4,6 @@ void
test_separator(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx0, *bx, *bt, *sp;
char buf[PATH_MAX];
win = elm_win_add(NULL, "separators", ELM_WIN_BASIC);
elm_win_title_set(win, "Separators");

View File

@ -6,61 +6,62 @@
# include "EWeather_Smart.h"
#endif
#ifdef HAVE_ELEMENTARY_EWEATHER
static Evas_Object *en, *hv, *fl;
static Evas_Object *weather[2];
static int current = 0;
static Eina_Module *module[2];
static void _first_city_cb(void *data, Evas_Object *o, void *event_info)
static void
_first_city_cb(void *data, Evas_Object *o, void *event_info)
{
if(!current) return ;
current = 0;
elm_flip_go(fl, ELM_FLIP_ROTATE_YZ_CENTER_AXIS);
if (!current) return;
current = 0;
elm_flip_go(fl, ELM_FLIP_ROTATE_YZ_CENTER_AXIS);
}
static void _second_city_cb(void *data, Evas_Object *o, void *event_info)
static void
_second_city_cb(void *data, Evas_Object *o, void *event_info)
{
if(current) return ;
current = 1;
elm_flip_go(fl, ELM_FLIP_ROTATE_XZ_CENTER_AXIS);
if (current) return;
current = 1;
elm_flip_go(fl, ELM_FLIP_ROTATE_XZ_CENTER_AXIS);
}
static void _apply_cb(void *data, Evas_Object *o, void *event_info)
{
#ifdef HAVE_ELEMENTARY_EWEATHER
EWeather *eweather = eweather_object_eweather_get(weather[current]);
if (module[current])
eweather_plugin_set(eweather, module[current]);
eweather_code_set(eweather, elm_entry_entry_get(en));
printf("CURRENT %d %p %p\n", current, module[current], eweather);
#endif
}
static void
_hover_select_cb(void *data, Evas_Object *obj, void *event_info)
{
#ifdef HAVE_ELEMENTARY_EWEATHER
EWeather *eweather = eweather_object_eweather_get(weather[0]);
module[0] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
eweather = eweather_object_eweather_get(weather[1]);
module[1] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
printf("%p %p\n", module[0], module[1]);
#endif
}
#endif
void
test_weather(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *bx0, *bt;
Evas_Object *win, *bg;
#ifdef HAVE_ELEMENTARY_EWEATHER
Evas_Object *bx, *bx0, *bt;
EWeather *eweather;
#endif
Eina_Array_Iterator it;
Eina_Array *array;
Eina_Module *m;
int i;
#endif
win = elm_win_add(NULL, "weather", ELM_WIN_BASIC);
elm_win_title_set(win, "Weather");
@ -140,9 +141,7 @@ test_weather(void *data, Evas_Object *obj, void *event_info)
array = eweather_plugins_list_get(eweather);
EINA_ARRAY_ITER_NEXT(array, i, m, it)
{
elm_hoversel_item_add(hv, eweather_plugin_name_get(eweather, i), NULL, ELM_ICON_NONE, _hover_select_cb, NULL);
}
elm_hoversel_item_add(hv, eweather_plugin_name_get(eweather, i), NULL, ELM_ICON_NONE, _hover_select_cb, NULL);
en = elm_entry_add(win);
elm_entry_line_wrap_set(en, 0);

View File

@ -29,7 +29,7 @@ my_bt_38_alpha_off(void *data, Evas_Object *obj, void *event_info)
static void
my_ck_38_resize(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
// Evas_Object *win = data;
rotate_with_resize = elm_check_state_get(obj);
}
@ -37,7 +37,6 @@ static void
my_bt_38_rot_0(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
Evas_Object *bg = evas_object_data_get(win, "bg");
if (rotate_with_resize)
elm_win_rotation_with_resize_set(win, 0);
else
@ -48,7 +47,6 @@ static void
my_bt_38_rot_90(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
Evas_Object *bg = evas_object_data_get(win, "bg");
if (rotate_with_resize)
elm_win_rotation_with_resize_set(win, 90);
else
@ -59,7 +57,6 @@ static void
my_bt_38_rot_180(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
Evas_Object *bg = evas_object_data_get(win, "bg");
if (rotate_with_resize)
elm_win_rotation_with_resize_set(win, 180);
else
@ -70,7 +67,6 @@ static void
my_bt_38_rot_270(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win = data;
Evas_Object *bg = evas_object_data_get(win, "bg");
if (rotate_with_resize)
elm_win_rotation_with_resize_set(win, 270);
else
@ -109,8 +105,6 @@ void
test_win_state(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *sl, *bx, *bx2, *bt, *ck;
static Testitem tit[3];
int i;
win = elm_win_add(NULL, "window-state", ELM_WIN_BASIC);
elm_win_title_set(win, "Window States");