libburnia/experimental-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some errors thanks to llvm clang static analyzer, also begin config inwin.

Browse Source
This commit is contained in:
Jaime Thomas
2009-01-08 02:33:00 +00:00
parent 4b5ad3091a
commit 797a8a8498
6 changed files with 97 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ecdb/trunk/src/ecdb_widgets.c
View File

@@ -287,6 +287,9 @@ _entry_markup_to_text(const char *mkup)
char *tag_start, *tag_end, *esc_start, *esc_end, *ts;
tag_start = tag_end = esc_start = esc_end = NULL;
if (!mkup)
return NULL;
p = (char *)mkup;
s = p;
for (;;)
@@ -459,7 +462,7 @@ struct _Combo_Data
const char *name;
const char *header;
void *data;
Evas_Object * (*create_header)(Evas_Object *, const char *name, void *data,
void (*create_header)(Evas_Object *, const char *name, void *data,
Evas_Object *, int);
};
@@ -566,9 +569,16 @@ _combo_clicked(void *data, Evas_Object *obj, void *event_info)
cd->selected = i;
header = edje_object_part_swallow_get(data, "ecdb.header.swallow");
if (header)
{
edje_object_part_unswallow(data, header);
evas_object_del(header);
}
if (cd->create_header)
header = cd->create_header(data, "ecdb.header.swallow", cd->data,
swallow, i);
cd->create_header(data, "ecdb.header.swallow", cd->data, swallow, i);
edje_object_signal_emit(data, "ecdb,combo,header,swallow", "ecdb");
ecdb_combo_collapse(data);
}
@@ -767,7 +777,7 @@ ecdb_combo_collapse(Evas_Object *c)
}
void
ecdb_combo_header_create_set(Evas_Object *c, Evas_Object * (*func)
ecdb_combo_header_create_set(Evas_Object *c, void (*func)
(Evas_Object *c, const char *name,
void *data, Evas_Object *clicked, int idx))
{
@@ -825,3 +835,41 @@ ecdb_label_text_set(Evas_Object *l, const char *text)
{
edje_object_part_text_set(l, "ecdb.label", text);
}
/************************* Config Inwin **************************************/
Evas_Object *
ecdb_config_inwin_add(Evas_Object *parent, const char *name)
{
Evas_Object *iw;
iw = ecdb_widget_add(parent, name);
edje_object_file_set(iw, em->theme_path, "ecdb/config_inwin");
/*
evas_object_event_callback_add(parent, EVAS_CALLBACK_RESIZE, _combo_resize,
iw);
evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE, _combo_hide, iw);
evas_object_event_callback_add(c, EVAS_CALLBACK_DEL, _combo_del, iw);
*/
return iw;
}
void
ecdb_config_inwin_child_add(Evas_Object *inwin, Evas_Object *child,
int sc, int ec, int sr, int er)
{
if (!inwin)
{
printf("ecdb_config_inwin_child_add: NULL parent!\n");
return;
}
if (!child)
return;
if (!edje_object_part_table_pack(inwin, "ecdb.table", child, sc, sr, ec, er))
{
printf("ecdb_config_inwin_child_add: Couldn't append to table!\n");
}
}