summaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl/e17
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-03-14 19:59:19 +0000
committerKhem Raj <raj.khem@gmail.com>2012-03-16 09:32:25 -0700
commit1502c432e6584ec3deceba7de617d47b79830549 (patch)
tree6cd4bd273ed93bb966ceb7924deb6ff3bcc8cba3 /meta-efl/recipes-efl/e17
parent8e7090f0bef0b006b10d80f77687f0929f9b3eb1 (diff)
downloadmeta-openembedded-1502c432e6584ec3deceba7de617d47b79830549.tar.gz
e-tasks: drop local patches and use our github repo instead
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-efl/recipes-efl/e17')
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0001-depend-on-eina-not-eina-0.patch26
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch27
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0003-adapt-to-newer-elm-API.patch656
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0004-fix-changed-callback-name.patch40
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch182
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch296
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0007-db_sqlite-fix-warning.patch35
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks/0008-fix-warning-about-incompatible-pointer-types.patch79
-rw-r--r--meta-efl/recipes-efl/e17/e-tasks_git.bb (renamed from meta-efl/recipes-efl/e17/e-tasks_svn.bb)17
9 files changed, 4 insertions, 1354 deletions
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0001-depend-on-eina-not-eina-0.patch b/meta-efl/recipes-efl/e17/e-tasks/0001-depend-on-eina-not-eina-0.patch
deleted file mode 100644
index a514bd2ca..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0001-depend-on-eina-not-eina-0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From ced1e0e6e0e7b80ad4e9b9766e0a132dc97d6bb6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 20:54:31 +0100
4Subject: [PATCH 1/8] depend on eina not eina-0
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 configure.ac | 2 +-
9 1 files changed, 1 insertions(+), 1 deletions(-)
10
11diff --git a/configure.ac b/configure.ac
12index c0a5697..0b67de8 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -15,7 +15,7 @@ AC_HEADER_STDC
16
17 AM_PROG_LIBTOOL
18
19-PKG_CHECK_MODULES(TASKS, [elementary eina-0 dbus-1 sqlite3])
20+PKG_CHECK_MODULES(TASKS, [elementary eina dbus-1 sqlite3])
21
22 AC_OUTPUT([
23 Makefile
24--
251.7.8.4
26
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch b/meta-efl/recipes-efl/e17/e-tasks/0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch
deleted file mode 100644
index fbc58516f..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 80893c65d5ea68f18e26169323a62eeac14ae177 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 20:53:48 +0100
4Subject: [PATCH 2/8] adapt to elementary genlist_item_insert_before API
5 change from r55869
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 src/gui.c | 2 +-
10 1 files changed, 1 insertions(+), 1 deletions(-)
11
12diff --git a/src/gui.c b/src/gui.c
13index 113c807..f58dcd6 100644
14--- a/src/gui.c
15+++ b/src/gui.c
16@@ -1067,7 +1067,7 @@ void create_new_task(void *data, Evas_Object *obj, void *event_info)
17 if(strcmp(sel_category, " All Tasks ")==0) strcpy(Task[i].cat, "Personal");
18 else strcpy(Task[i].cat, sel_category);
19 if(item) {
20- task_list[i] = elm_genlist_item_insert_after(list, &itc1, &Task[i], item, ELM_GENLIST_ITEM_NONE,
21+ task_list[i] = elm_genlist_item_insert_after(list, &itc1, &Task[i], NULL, item, ELM_GENLIST_ITEM_NONE,
22 NULL, NULL);
23 }
24 //cater for no items in list
25--
261.7.8.4
27
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0003-adapt-to-newer-elm-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0003-adapt-to-newer-elm-API.patch
deleted file mode 100644
index cf5469e1a..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0003-adapt-to-newer-elm-API.patch
+++ /dev/null
@@ -1,656 +0,0 @@
1From 377c4266e9356239c43ac5711a06831ee74f9eef Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 6 Dec 2011 19:07:56 +0100
4Subject: [PATCH 3/8] adapt to newer elm API
5
6* sed 's/elm_button_label_set/elm_object_text_set/g' -i src/gui.c
7 sed 's/elm_button_label_set/elm_object_text_set/g' -i src/db_sqlite.c
8 sed 's/elm_label_label_set/elm_object_text_set/g' -i src/gui.c
9 sed 's/elm_button_icon_set/elm_object_content_set/g' -i src/gui.c
10 sed 's/elm_box_homogenous_set/elm_box_homogeneous_set/g' -i src/gui.c
11 sed 's/label_get/text_get/g' -i src/gui.c
12 sed 's/icon_get/content_get/g' -i src/gui.c
13
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 src/db_sqlite.c | 12 ++--
17 src/gui.c | 138 +++++++++++++++++++++++++++---------------------------
18 2 files changed, 75 insertions(+), 75 deletions(-)
19
20diff --git a/src/db_sqlite.c b/src/db_sqlite.c
21index dfee471..fde2181 100644
22--- a/src/db_sqlite.c
23+++ b/src/db_sqlite.c
24@@ -118,7 +118,7 @@ void restore_state(void)
25 if (db_ret == SQLITE_ROW) sprintf(sel_category, "%s", sqlite3_column_text(stmt, 0));
26 sqlite3_finalize(stmt);
27 if(strcmp(sel_category, "")== 0) strcpy(sel_category, " All Tasks ");
28- elm_button_label_set(sel_cat_bt, sel_category);
29+ elm_object_text_set(sel_cat_bt, sel_category);
30 load_data ();
31 }
32
33@@ -232,7 +232,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
34 if (i) {
35 sprintf(cate, " All Tasks ");
36 bt = elm_button_add(win);
37- elm_button_label_set(bt,cate);
38+ elm_object_text_set(bt,cate);
39 elm_box_pack_end(bx, bt);
40 tystr = strdup(cate);
41 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
42@@ -240,7 +240,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
43
44 sprintf(cate, "Deleted");
45 bt = elm_button_add(win);
46- elm_button_label_set(bt,cate);
47+ elm_object_text_set(bt,cate);
48 elm_box_pack_end(bx, bt);
49 tystr = strdup(cate);
50 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
51@@ -248,7 +248,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
52
53 sprintf(cate, "Edit Categories");
54 bt = elm_button_add(win);
55- elm_button_label_set(bt,cate);
56+ elm_object_text_set(bt,cate);
57 elm_box_pack_end(bx, bt);
58 tystr = strdup(cate);
59 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
60@@ -264,7 +264,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
61 sprintf(cate, "%s", sqlite3_column_text(stmt, 0));
62 if (i) {
63 bt = elm_button_add(win);
64- elm_button_label_set(bt,cate);
65+ elm_object_text_set(bt,cate);
66 elm_box_pack_end(bx, bt);
67 tystr = strdup(cate);
68 evas_object_smart_callback_add(bt, "clicked", select_category, (char *)tystr);
69@@ -272,7 +272,7 @@ void add_hs_items(Evas_Object *win, Evas_Object *bx, Evas_Object *bt, int i)
70 }
71 else {
72 bt = elm_button_add(win);
73- elm_button_label_set(bt, cate);
74+ elm_object_text_set(bt, cate);
75 elm_box_pack_end(bx, bt);
76 tystr = strdup(cate);
77 evas_object_smart_callback_add(bt, "clicked", set_category, (char *)tystr);
78diff --git a/src/gui.c b/src/gui.c
79index f58dcd6..f6f1c6c 100644
80--- a/src/gui.c
81+++ b/src/gui.c
82@@ -51,11 +51,11 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
83 return;
84 }
85 if(strcmp(cat, "Deleted") ==0) {
86- elm_button_label_set(new_button, "Purge");
87+ elm_object_text_set(new_button, "Purge");
88 }
89- else elm_button_label_set(new_button, "Add");
90+ else elm_object_text_set(new_button, "Add");
91
92- elm_button_label_set(sel_cat_bt, cat);
93+ elm_object_text_set(sel_cat_bt, cat);
94 strcpy(sel_category, cat);
95 elm_genlist_clear(list);
96 last_rec = -1;
97@@ -92,10 +92,10 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
98 item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li);
99 tsk = (_Task *)elm_genlist_item_data_get(item);
100 last_rec = tsk->no;
101- elm_button_label_set(cat_bt, tsk->cat);
102+ elm_object_text_set(cat_bt, tsk->cat);
103 sprintf(tystr, "%d", tsk->pr);
104- elm_button_label_set(pr_bt, tystr);
105- elm_button_label_set(date_bt, tsk->date);
106+ elm_object_text_set(pr_bt, tystr);
107+ elm_object_text_set(date_bt, tsk->date);
108 elm_entry_entry_set(tk, tsk->text);
109 if (strcmp(tsk->text, "Task") == 0) elm_entry_select_all(tk);
110 }
111@@ -109,7 +109,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info)
112 char *prio = (char *)data;
113 ty = atoi(prio);
114 sprintf(tystr, "%d", ty);
115- elm_button_label_set(pr_bt, tystr);
116+ elm_object_text_set(pr_bt, tystr);
117
118 Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
119 evas_object_hide(hv);
120@@ -134,7 +134,7 @@ void set_category(void *data, Evas_Object *obj, void *event_info)
121 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
122 if (strcmp(tsk->cat, category) == 0) return;
123 strcpy(tsk->cat, category);
124- elm_button_label_set(cat_bt, category);
125+ elm_object_text_set(cat_bt, category);
126 WRITE = 1;
127 if (strcmp(sel_category, " All Tasks ") !=0 &&
128 strcmp(sel_category, category) != 0) elm_genlist_item_del(item);
129@@ -144,7 +144,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info)
130 {
131 char *dt = (char *)data;
132 //set the date
133- elm_button_label_set(date_bt, dt);
134+ elm_object_text_set(date_bt, dt);
135 evas_object_hide(date_hs);
136 Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
137 if (!item) {
138@@ -185,7 +185,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
139
140 sprintf(dt, "No Date");
141 bt = elm_button_add(win);
142- elm_button_label_set(bt,dt);
143+ elm_object_text_set(bt,dt);
144 elm_box_pack_end(bx, bt);
145 tystr = strdup(dt);
146 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
147@@ -197,7 +197,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
148 strftime(dt, 6, "%d-%m", loctime);
149 //sprintf(dt, " All Tasks ");
150 bt = elm_button_add(win);
151- elm_button_label_set(bt,dt);
152+ elm_object_text_set(bt,dt);
153 elm_box_pack_end(bx, bt);
154 tystr = strdup(dt);
155 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
156@@ -206,7 +206,7 @@ void add_dates(Evas_Object *win, Evas_Object *bx, Evas_Object *bt)
157
158 sprintf(dt, "Calendar");
159 bt = elm_button_add(win);
160- elm_button_label_set(bt,dt);
161+ elm_object_text_set(bt,dt);
162 elm_box_pack_end(bx, bt);
163 tystr = strdup(dt);
164 evas_object_smart_callback_add(bt, "clicked", set_date, (char *)tystr);
165@@ -221,7 +221,7 @@ void set_create_date(void *data, Evas_Object *obj, void *event_info)
166 _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
167 strcpy(tsk->date, det->data);
168 //update button label
169- elm_button_label_set(det->button, det->data);
170+ elm_object_text_set(det->button, det->data);
171 WRITE = 1;
172 }
173
174@@ -233,7 +233,7 @@ void set_create_priority(void *data, Evas_Object *obj, void *event_info)
175 _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
176 tsk->pr = atoi(det->data);
177 //update button label
178- elm_button_label_set(det->button, det->data);
179+ elm_object_text_set(det->button, det->data);
180 WRITE = 1;
181 }
182
183@@ -320,14 +320,14 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
184
185 //add a label to frame
186 lb = elm_label_add(det_page);
187- elm_label_label_set(lb,"Edit Task Details");
188+ elm_object_text_set(lb,"Edit Task Details");
189 evas_object_size_hint_align_set(lb, 0.5, -1.0);
190 elm_frame_content_set(fr, lb);
191 evas_object_show(lb);
192
193 //add a label
194 lb = elm_label_add(det_page);
195- elm_label_label_set(lb,"Task:");
196+ elm_object_text_set(lb,"Task:");
197 evas_object_size_hint_align_set(lb, 1.0, 0.5);
198 elm_table_pack(tb, lb, 0, 1, 1, 1);
199 evas_object_show(lb);
200@@ -343,7 +343,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
201
202 //add a label to hbox
203 lb = elm_label_add(det_page);
204- elm_label_label_set(lb,"Priority:");
205+ elm_object_text_set(lb,"Priority:");
206 evas_object_size_hint_align_set(lb, 1.0, 0.5);
207 elm_table_pack(tb, lb, 0, 2, 1, 1);
208 evas_object_show(lb);
209@@ -357,7 +357,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
210
211 c_pr_bt = elm_button_add(det_page);
212 sprintf(no, "%d", tsk->pr);
213- elm_button_label_set(c_pr_bt, no);
214+ elm_object_text_set(c_pr_bt, no);
215 evas_object_smart_callback_add(c_pr_bt, "clicked", my_hover_bt_1, det_hv);
216 elm_box_pack_end(bx, c_pr_bt);
217 evas_object_show(c_pr_bt);
218@@ -365,7 +365,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
219 elm_hover_target_set(det_hv, c_pr_bt);
220
221 bt = elm_button_add(det_page);
222- elm_button_label_set(bt, "Pr");
223+ elm_object_text_set(bt, "Pr");
224 elm_hover_content_set(det_hv, "middle", bt);
225 evas_object_show(bt);
226
227@@ -377,7 +377,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
228 det[i].button = c_pr_bt;
229 bt = elm_button_add(det_page);
230 sprintf(no, "%d", i);
231- elm_button_label_set(bt, no);
232+ elm_object_text_set(bt, no);
233 elm_box_pack_end(bx, bt);
234 det[i].data = strdup(no);
235 evas_object_smart_callback_add(bt, "clicked", set_create_priority, &det[i]);
236@@ -388,7 +388,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
237
238 //add a label to hbox
239 lb = elm_label_add(det_page);
240- elm_label_label_set(lb,"Category:");
241+ elm_object_text_set(lb,"Category:");
242 evas_object_size_hint_align_set(lb, 1.0, 0.5);
243 elm_table_pack(tb, lb, 0, 3, 1, 1);
244 evas_object_show(lb);
245@@ -400,7 +400,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
246 evas_object_show(bx);
247
248 cat_bt = elm_button_add(det_page);
249- elm_button_label_set(cat_bt, tsk->cat);
250+ elm_object_text_set(cat_bt, tsk->cat);
251 evas_object_smart_callback_add(cat_bt, "clicked", my_hover_bt_1, hs);
252 elm_box_pack_end(bx, cat_bt);
253 evas_object_show(cat_bt);
254@@ -408,7 +408,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
255 elm_hover_target_set(hs, cat_bt);
256
257 bt = elm_button_add(det_page);
258- elm_button_label_set(bt, "Category");
259+ elm_object_text_set(bt, "Category");
260 elm_hover_content_set(hs, "middle", bt);
261 evas_object_show(bt);
262
263@@ -420,7 +420,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
264
265 //add a label to hbox
266 lb = elm_label_add(det_page);
267- elm_label_label_set(lb, "Date:");
268+ elm_object_text_set(lb, "Date:");
269 evas_object_size_hint_align_set(lb, 1.0, 0.5);
270 elm_table_pack(tb, lb, 0, 4, 1, 1);
271 evas_object_show(lb);
272@@ -433,7 +433,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
273 evas_object_show(bx);
274
275 c_date_bt = elm_button_add(det_page);
276- elm_button_label_set(c_date_bt, tsk->date);
277+ elm_object_text_set(c_date_bt, tsk->date);
278 evas_object_smart_callback_add(c_date_bt, "clicked", my_hover_bt_1, c_date_hs);
279 elm_box_pack_end(bx, c_date_bt);
280 evas_object_show(c_date_bt);
281@@ -441,7 +441,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
282 elm_hover_target_set(c_date_hs, c_date_bt);
283
284 bt = elm_button_add(det_page);
285- elm_button_label_set(bt, "Date");
286+ elm_object_text_set(bt, "Date");
287 elm_hover_content_set(c_date_hs, "middle", bt);
288 evas_object_show(bt);
289
290@@ -453,7 +453,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
291 det[6].button = c_date_bt;
292 sprintf(dt, "No Date");
293 bt = elm_button_add(det_page);
294- elm_button_label_set(bt,dt);
295+ elm_object_text_set(bt,dt);
296 elm_box_pack_end(bx, bt);
297 det[6].data = strdup(dt);
298 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[6]);
299@@ -467,7 +467,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
300 loctime = localtime (&tm);
301 strftime(dt, 7, "%d-%m", loctime);
302 bt = elm_button_add(det_page);
303- elm_button_label_set(bt,dt);
304+ elm_object_text_set(bt,dt);
305 elm_box_pack_end(bx, bt);
306 det[7+i].data = strdup(dt);
307 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[7+i]);
308@@ -479,7 +479,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
309 det[14].button = c_date_bt;
310 sprintf(dt, "Calendar");
311 bt = elm_button_add(det_page);
312- elm_button_label_set(bt,dt);
313+ elm_object_text_set(bt,dt);
314 elm_box_pack_end(bx, bt);
315 det[14].data = strdup(dt);
316 evas_object_smart_callback_add(bt, "clicked", set_create_date, &det[14]);
317@@ -490,7 +490,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
318
319 //add a label
320 lb = elm_label_add(det_page);
321- elm_label_label_set(lb,"Note:");
322+ elm_object_text_set(lb,"Note:");
323 evas_object_size_hint_align_set(lb, 1.0, 0.5);
324 elm_table_pack(tb, lb, 0, 5, 1, 1);
325 evas_object_show(lb);
326@@ -509,7 +509,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
327 evas_object_show(note_entry);
328
329 /*lb = elm_label_add(det_page);
330- elm_label_label_set(lb,"Note:");
331+ elm_object_text_set(lb,"Note:");
332 elm_table_pack(tb, lb, 1, 5, 2, 1);
333 evas_object_show(lb);*/
334
335@@ -523,7 +523,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
336
337 //add done button
338 bt_done = elm_button_add(det_page);
339- elm_button_label_set(bt_done, "Done");
340+ elm_object_text_set(bt_done, "Done");
341 evas_object_size_hint_weight_set(bt_done, 1.0, 0.0);
342 evas_object_size_hint_align_set(bt_done, -1.0, -1.0);
343 elm_table_pack(tb, bt_done, 0, 7, 1, 1);
344@@ -532,7 +532,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
345
346 //add del button
347 bt = elm_button_add(det_page);
348- elm_button_label_set(bt, "Delete");
349+ elm_object_text_set(bt, "Delete");
350 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
351 evas_object_size_hint_align_set(bt, -1.0, -1.0);
352 elm_table_pack(tb, bt, 1, 7, 1, 1);
353@@ -543,7 +543,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
354 //bt = elm_button_add(det_page);
355 //evas_object_size_hint_weight_set(bt, 1.0, 1.0);
356 //evas_object_size_hint_align_set(bt, -1.0, -1.0);
357- //elm_button_label_set(bt, "Note");
358+ //elm_object_text_set(bt, "Note");
359 //elm_box_pack_end(hbox1, bt);
360 //evas_object_show(bt);
361 //evas_object_smart_callback_add(bt, "clicked", det_page_add, entry);
362@@ -552,7 +552,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
363 bt = elm_button_add(det_page);
364 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
365 evas_object_size_hint_align_set(bt, -1.0, -1.0);
366- elm_button_label_set(bt, "Cancel");
367+ elm_object_text_set(bt, "Cancel");
368 elm_table_pack(tb, bt, 2, 7, 1, 1);
369 evas_object_show(bt);
370 evas_object_smart_callback_add(bt, "clicked", cat_win_del, det_page);
371@@ -674,7 +674,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
372 evas_object_size_hint_align_set(bx2, -1.0, -1.0);
373
374 bt = elm_button_add(note_win);
375- elm_button_label_set(bt, "Clear");
376+ elm_object_text_set(bt, "Clear");
377 evas_object_smart_callback_add(bt, "clicked", note_clear, en);
378 evas_object_size_hint_align_set(bt, -1.0, -1.0);
379 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
380@@ -682,7 +682,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
381 evas_object_show(bt);
382
383 //bt = elm_button_add(note_win);
384- //elm_button_label_set(bt, "Save");
385+ //elm_object_text_set(bt, "Save");
386 //evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en);
387 //evas_object_size_hint_align_set(bt, -1.0, -1.0);
388 //evas_object_size_hint_weight_set(bt, 1.0, 0.0);
389@@ -690,7 +690,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
390 //evas_object_show(bt);
391
392 bt = elm_button_add(note_win);
393- elm_button_label_set(bt, "Cancel");
394+ elm_object_text_set(bt, "Cancel");
395 evas_object_smart_callback_add(bt, "clicked", cat_win_del, note_win);
396 evas_object_size_hint_align_set(bt, -1.0, -1.0);
397 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
398@@ -698,7 +698,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
399 evas_object_show(bt);
400
401 bt = elm_button_add(note_win);
402- elm_button_label_set(bt, "Done");
403+ elm_object_text_set(bt, "Done");
404 evas_object_smart_callback_add(bt, "clicked", note_done, en);
405 evas_object_size_hint_align_set(bt, -1.0, -1.0);
406 evas_object_size_hint_weight_set(bt, 1.0, 0.0);
407@@ -728,7 +728,7 @@ void create_cat_hover(void)
408 //for genlist
409 Elm_Genlist_Item_Class itc1;
410
411-char *gl_label_get(const void *data, Evas_Object *obj, const char *part)
412+char *gl_text_get(const void *data, Evas_Object *obj, const char *part)
413 {
414 _Task *tsk = (_Task *)data;
415 char tystr[255], *ty;
416@@ -739,7 +739,7 @@ char *gl_label_get(const void *data, Evas_Object *obj, const char *part)
417 //return NULL;
418 }
419
420-Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
421+Evas_Object *gl_content_get(const void *data, Evas_Object *obj, const char *part)
422 {
423 _Task *tsk = (_Task *)data;
424
425@@ -759,7 +759,7 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
426 //add a label for priority
427 sprintf(txt, "%d", tsk->pr);
428 pr_lb = elm_label_add(obj);
429- elm_label_label_set(pr_lb, txt);
430+ elm_object_text_set(pr_lb, txt);
431 elm_box_pack_end(bx, pr_lb);
432 evas_object_show(pr_lb);
433 evas_object_show(bx);
434@@ -812,7 +812,7 @@ Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
435 }
436
437 lb_date = elm_label_add(obj);
438- elm_label_label_set(lb_date, tsk->date);
439+ elm_object_text_set(lb_date, tsk->date);
440 elm_box_pack_end(bx, lb_date);
441 evas_object_size_hint_weight_set(lb_date, 0.0, 0.0);
442 evas_object_size_hint_align_set(lb_date, 1.0, 0.5);
443@@ -871,7 +871,7 @@ void create_gui(Evas_Object *win)
444 evas_object_show(bx);
445
446 pr_bt = elm_button_add(win);
447- elm_button_label_set(pr_bt, "Pr");
448+ elm_object_text_set(pr_bt, "Pr");
449 evas_object_smart_callback_add(pr_bt, "clicked", my_hover_bt_1, hv);
450 elm_box_pack_end(bx, pr_bt);
451 evas_object_show(pr_bt);
452@@ -879,7 +879,7 @@ void create_gui(Evas_Object *win)
453 elm_hover_target_set(hv, pr_bt);
454
455 bt = elm_button_add(win);
456- elm_button_label_set(bt, "Pr");
457+ elm_object_text_set(bt, "Pr");
458 elm_hover_content_set(hv, "middle", bt);
459 evas_object_show(bt);
460
461@@ -888,7 +888,7 @@ void create_gui(Evas_Object *win)
462 for (i=1; i<6; i++) {
463 bt = elm_button_add(win);
464 sprintf(no, "%d", i);
465- elm_button_label_set(bt, no);
466+ elm_object_text_set(bt, no);
467 elm_box_pack_end(bx, bt);
468 tystr = strdup(no);
469 evas_object_smart_callback_add(bt, "clicked", set_priority, (char *)tystr);
470@@ -925,7 +925,7 @@ void create_gui(Evas_Object *win)
471 evas_object_show(bx1);
472
473 date_bt = elm_button_add(win);
474- elm_button_label_set(date_bt, "Date");
475+ elm_object_text_set(date_bt, "Date");
476 evas_object_smart_callback_add(date_bt, "clicked", my_hover_bt_1, date_hs);
477 elm_box_pack_end(bx1, date_bt);
478 evas_object_show(date_bt);
479@@ -933,7 +933,7 @@ void create_gui(Evas_Object *win)
480 elm_hover_target_set(date_hs, date_bt);
481
482 bt = elm_button_add(win);
483- elm_button_label_set(bt, "Date");
484+ elm_object_text_set(bt, "Date");
485 elm_hover_content_set(date_hs, "middle", bt);
486 evas_object_show(bt);
487
488@@ -944,7 +944,7 @@ void create_gui(Evas_Object *win)
489
490 //add save button
491 save_button = elm_button_add(win);
492- elm_button_label_set(save_button, "Save");
493+ elm_object_text_set(save_button, "Save");
494 evas_object_size_hint_weight_set(save_button, 0.0, 0.0);
495 evas_object_size_hint_align_set(save_button, 1.0, -1.0);
496 elm_box_pack_end(hbox, save_button);
497@@ -963,8 +963,8 @@ void create_gui(Evas_Object *win)
498
499 //genlist class defs
500 itc1.item_style = "default";
501- itc1.func.label_get = gl_label_get;
502- itc1.func.icon_get = gl_icon_get;
503+ itc1.func.text_get = gl_text_get;
504+ itc1.func.content_get = gl_content_get;
505 itc1.func.state_get = gl_state_get;
506 itc1.func.del = gl_del;
507
508@@ -978,7 +978,7 @@ void create_gui(Evas_Object *win)
509
510 //add new button to the hbox
511 new_button = elm_button_add(win);
512- elm_button_label_set(new_button, "Add");
513+ elm_object_text_set(new_button, "Add");
514 evas_object_size_hint_weight_set(new_button, 1.0, 1.0);
515 evas_object_size_hint_align_set(new_button, -1.0, -1.0);
516 elm_box_pack_end(hbox1, new_button);
517@@ -987,7 +987,7 @@ void create_gui(Evas_Object *win)
518
519 //add Properties button to the hbox
520 prop_button = elm_button_add(win);
521- elm_button_label_set(prop_button, "Details");
522+ elm_object_text_set(prop_button, "Details");
523 evas_object_size_hint_weight_set(prop_button, 1.0, 1.0);
524 evas_object_size_hint_align_set(prop_button, -1.0, -1.0);
525 elm_box_pack_end(hbox1, prop_button);
526@@ -1000,9 +1000,9 @@ void create_gui(Evas_Object *win)
527 snprintf(buf, sizeof(buf), "/usr/share/e-tasks/note_butt.png");
528 elm_icon_file_set(ic, buf, NULL);
529 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
530- elm_button_icon_set(note_button, ic);
531+ elm_object_content_set(note_button, ic);
532 evas_object_show(ic);
533- //elm_button_label_set(note_button, "Note");
534+ //elm_object_text_set(note_button, "Note");
535 evas_object_size_hint_weight_set(note_button, 1.0, 1.0);
536 evas_object_size_hint_align_set(note_button, -1.0, -1.0);
537 elm_box_pack_end(hbox1, note_button);
538@@ -1018,7 +1018,7 @@ void create_gui(Evas_Object *win)
539 evas_object_show(bx);
540
541 sel_cat_bt = elm_button_add(win);
542- elm_button_label_set(sel_cat_bt, " All Tasks ");
543+ elm_object_text_set(sel_cat_bt, " All Tasks ");
544 evas_object_smart_callback_add(sel_cat_bt, "clicked", my_hover_bt_1, hs1);
545 elm_box_pack_end(bx, sel_cat_bt);
546 evas_object_show(sel_cat_bt);
547@@ -1026,7 +1026,7 @@ void create_gui(Evas_Object *win)
548 elm_hover_target_set(hs1, sel_cat_bt);
549
550 bt = elm_button_add(win);
551- elm_button_label_set(bt, " All Tasks ");
552+ elm_object_text_set(bt, " All Tasks ");
553 elm_hover_content_set(hs1, "middle", bt);
554 evas_object_show(bt);
555 create_cat_hover ();
556@@ -1131,7 +1131,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
557
558 //add a label to hbox
559 lb = elm_label_add(cat_dialog);
560- elm_label_label_set(lb,"Category:");
561+ elm_object_text_set(lb,"Category:");
562 elm_box_pack_end(hbox, lb);
563 evas_object_show(lb);
564
565@@ -1149,13 +1149,13 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
566 //add another hbox
567 hbox1 = elm_box_add(cat_dialog);
568 elm_box_horizontal_set(hbox1, 1);
569- elm_box_homogenous_set(hbox1, 1);
570+ elm_box_homogeneous_set(hbox1, 1);
571 elm_box_pack_end(vbox, hbox1);
572 evas_object_show(hbox1);
573
574 //add yes button
575 bt = elm_button_add(cat_dialog);
576- elm_button_label_set(bt, "Add");
577+ elm_object_text_set(bt, "Add");
578 evas_object_size_hint_align_set(bt, -1.0, -1.0);
579 elm_box_pack_end(hbox1, bt);
580 evas_object_show(bt);
581@@ -1163,7 +1163,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
582
583 //add close button
584 bt1 = elm_button_add(cat_dialog);
585- elm_button_label_set(bt1, "Cancel");
586+ elm_object_text_set(bt1, "Cancel");
587 elm_box_pack_end(hbox1, bt1);
588 evas_object_show(bt1);
589 evas_object_smart_callback_add(bt1, "clicked", cat_win_del, cat_dialog);
590@@ -1203,14 +1203,14 @@ void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info)
591 if(strcmp(sel_category, _cat) == 0) select_category (" All Tasks ", NULL, NULL);
592 }
593
594-char *cat_label_get(const void *data, Evas_Object *obj, const char *part)
595+char *cat_text_get(const void *data, Evas_Object *obj, const char *part)
596 {
597 char *_cat = (char *)data;
598 char *ty = strdup(_cat);
599 return (ty);
600 }
601
602-Evas_Object *cat_icon_get(const void *data, Evas_Object *obj, const char *part)
603+Evas_Object *cat_content_get(const void *data, Evas_Object *obj, const char *part)
604 {
605 return NULL;
606 }
607@@ -1262,7 +1262,7 @@ void edit_cat(void)
608
609 // add a label
610 lb = elm_label_add(cat_win);
611- elm_label_label_set(lb, "Task Categories");
612+ elm_object_text_set(lb, "Task Categories");
613 elm_frame_content_set(fr, lb);
614 evas_object_show(lb);
615
616@@ -1277,8 +1277,8 @@ void edit_cat(void)
617
618 //genlist class defs
619 itc2.item_style = "default";
620- itc2.func.label_get = cat_label_get;
621- itc2.func.icon_get = cat_icon_get;
622+ itc2.func.text_get = cat_text_get;
623+ itc2.func.content_get = cat_content_get;
624 itc2.func.state_get = cat_state_get;
625 itc2.func.del = cat_del;
626
627@@ -1292,7 +1292,7 @@ void edit_cat(void)
628
629 //add button to add categories
630 add_cat_button = elm_button_add(cat_win);
631- elm_button_label_set(add_cat_button, "Add");
632+ elm_object_text_set(add_cat_button, "Add");
633 evas_object_size_hint_weight_set(add_cat_button, 1.0, 1.0);
634 evas_object_size_hint_align_set(add_cat_button, -1.0, -1.0);
635 elm_box_pack_end(hbox, add_cat_button);
636@@ -1301,7 +1301,7 @@ void edit_cat(void)
637
638 //add button to del categories
639 del_cat_button = elm_button_add(cat_win);
640- elm_button_label_set(del_cat_button, "Delete");
641+ elm_object_text_set(del_cat_button, "Delete");
642 evas_object_size_hint_weight_set(del_cat_button, 1.0, 1.0);
643 evas_object_size_hint_align_set(del_cat_button, -1.0, -1.0);
644 elm_box_pack_end(hbox, del_cat_button);
645@@ -1310,7 +1310,7 @@ void edit_cat(void)
646
647 //add done button
648 done_button = elm_button_add(cat_win);
649- elm_button_label_set(done_button, "Done");
650+ elm_object_text_set(done_button, "Done");
651 evas_object_size_hint_weight_set(done_button, 1.0, 1.0);
652 evas_object_size_hint_align_set(done_button, -1.0, -1.0);
653 elm_box_pack_end(hbox, done_button);
654--
6551.7.8.4
656
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0004-fix-changed-callback-name.patch b/meta-efl/recipes-efl/e17/e-tasks/0004-fix-changed-callback-name.patch
deleted file mode 100644
index c4d5ac78a..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0004-fix-changed-callback-name.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 4ca9e2aac3e9f1a981b48552c3aff255863cd1fe Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 17 Dec 2011 03:12:29 +0100
4Subject: [PATCH 4/8] fix changed callback name
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/gui.c | 2 +-
9 src/main.c | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/src/gui.c b/src/gui.c
13index f6f1c6c..69b06d8 100644
14--- a/src/gui.c
15+++ b/src/gui.c
16@@ -1230,7 +1230,7 @@ void edit_cat(void)
17
18 cat_win = elm_win_add(NULL, "cat", ELM_WIN_BASIC);
19 elm_win_title_set(cat_win, "Edit Categories");
20- evas_object_smart_callback_add(cat_win, "delete-request", cat_win_del, cat_win);
21+ evas_object_smart_callback_add(cat_win, "delete,request", cat_win_del, cat_win);
22
23 //add background
24 bg = elm_bg_add(cat_win);
25diff --git a/src/main.c b/src/main.c
26index 12072f5..116b84c 100644
27--- a/src/main.c
28+++ b/src/main.c
29@@ -64,7 +64,7 @@ elm_main(int argc, char **argv)
30 //set up win
31 win = elm_win_add(NULL, "tasks", ELM_WIN_BASIC);
32 elm_win_title_set(win, "Tasks");
33- evas_object_smart_callback_add(win, "delete-request", my_win_del, NULL);
34+ evas_object_smart_callback_add(win, "delete,request", my_win_del, NULL);
35
36 //open database
37 open_database();
38--
391.7.8.4
40
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch
deleted file mode 100644
index 2ea576f21..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0005-adapt-to-even-newer-elm-API.patch
+++ /dev/null
@@ -1,182 +0,0 @@
1From aa1ac5f8d2133ae04099a155811b65733447e34d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 20:51:09 +0100
4Subject: [PATCH 5/8] adapt to even newer elm API
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/db_sqlite.c | 2 +-
9 src/db_sqlite.h | 2 +-
10 src/gui.c | 30 +++++++++++++++---------------
11 src/main.c | 2 +-
12 4 files changed, 18 insertions(+), 18 deletions(-)
13
14diff --git a/src/db_sqlite.c b/src/db_sqlite.c
15index fde2181..3eb7790 100644
16--- a/src/db_sqlite.c
17+++ b/src/db_sqlite.c
18@@ -192,7 +192,7 @@ void load_data(void)
19 void show_cat_tasks(char *ca)
20 {
21 int i;
22- Elm_Genlist_Item *item;
23+ Elm_Object_Item *item;
24
25 elm_genlist_clear(list);
26 if (strcmp(ca, " All Tasks ") == 0) {
27diff --git a/src/db_sqlite.h b/src/db_sqlite.h
28index b595488..469aa48 100644
29--- a/src/db_sqlite.h
30+++ b/src/db_sqlite.h
31@@ -39,7 +39,7 @@ extern Evas_Object *list, *hs, *hs1, *cat_list, *sel_cat_bt;
32 void restore_state(void);
33 extern char home_dir[255], sel_category[255];
34 extern Elm_Genlist_Item_Class itc1, itc2;
35-extern Elm_Genlist_Item *task_list[500];
36+extern Elm_Object_Item *task_list[500];
37 extern int total_tasks;
38 typedef struct{
39 int no;
40diff --git a/src/gui.c b/src/gui.c
41index 69b06d8..0291378 100644
42--- a/src/gui.c
43+++ b/src/gui.c
44@@ -26,7 +26,7 @@ char dummy_cat[255];
45
46 typedef struct _Details
47 {
48- Elm_Genlist_Item *item;
49+ Elm_Object_Item *item;
50 Evas_Object *button;
51 Evas_Object *hover;
52 char *data;
53@@ -67,7 +67,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
54 {
55 char tystr[2];
56 char te_data[255], *task_entry;
57- Elm_Genlist_Item *item;
58+ Elm_Object_Item *item;
59 _Task *tsk=NULL;
60
61 //for entries, get entry data and check agianst previous task text, date
62@@ -89,7 +89,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
63 }
64
65 Evas_Object *li = data;
66- item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li);
67+ item = (Elm_Object_Item *)elm_genlist_selected_item_get(li);
68 tsk = (_Task *)elm_genlist_item_data_get(item);
69 last_rec = tsk->no;
70 elm_object_text_set(cat_bt, tsk->cat);
71@@ -111,7 +111,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info)
72 sprintf(tystr, "%d", ty);
73 elm_object_text_set(pr_bt, tystr);
74
75- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
76+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
77 evas_object_hide(hv);
78 if (!item) {
79 dummy_pr = atoi(prio);
80@@ -125,10 +125,10 @@ void set_priority(void *data, Evas_Object *obj, void *event_info)
81
82 void set_category(void *data, Evas_Object *obj, void *event_info)
83 {
84- Elm_Genlist_Item *item;
85+ Elm_Object_Item *item;
86 //change category value of selected task
87 char *category = data;
88- item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
89+ item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
90 evas_object_hide(hs);
91 if (!item) return;
92 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
93@@ -146,7 +146,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info)
94 //set the date
95 elm_object_text_set(date_bt, dt);
96 evas_object_hide(date_hs);
97- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
98+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
99 if (!item) {
100 strcpy(dummy_date, dt);
101 return;
102@@ -260,8 +260,8 @@ void det_page_done(void *data, Evas_Object *obj, void *event_info)
103 if(WRITE) {
104 WRITE = 0;
105 update_record (tsk->no);
106- Elm_Genlist_Item *item;
107- item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
108+ Elm_Object_Item *item;
109+ item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
110 if(item) elm_genlist_item_update(task_list[tsk->no]);
111 last_rec = -1;
112 item = elm_genlist_first_item_get(list);
113@@ -293,7 +293,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
114 curtime = time (NULL);
115
116 //check task selected - otherwise return
117- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
118+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
119 if(!item) return;
120 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
121 det_page = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
122@@ -566,7 +566,7 @@ void save_button_clicked(void *data, Evas_Object *obj, void *event_info)
123 char te_data[255], *task_entry;
124
125 //get task no
126- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
127+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
128 if (item) {
129 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
130
131@@ -626,7 +626,7 @@ void note_done(void *data, Evas_Object *obj, void *event_info)
132 char tystr[255];
133 //Evas_Object *en = data;
134
135- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
136+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
137 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
138 sprintf(tystr, "%s", elm_entry_entry_get(data));
139 if (strcmp(tystr, "<br>") == 0) strcpy(tystr, "");
140@@ -641,7 +641,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
141 Evas_Object *bg, *bx, *bx2, *bt, *en;
142 //char buf[PATH_MAX];
143
144- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(list);
145+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
146 if(!item) return;
147 _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
148
149@@ -1056,7 +1056,7 @@ void create_new_task(void *data, Evas_Object *obj, void *event_info)
150
151 //get selected task if any
152 Evas_Object *li = data;
153- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li);
154+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li);
155 if (!item) item = elm_genlist_last_item_get(list); //insert new line at end of list
156
157 Task[i].no = i;
158@@ -1193,7 +1193,7 @@ void cat_list_selected(void *data, Evas_Object *obj, void *event_info)
159 void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info)
160 {
161 Evas_Object *li = data;
162- Elm_Genlist_Item *item = (Elm_Genlist_Item *)elm_genlist_selected_item_get(li);
163+ Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li);
164 char *_cat = (char *)elm_genlist_item_data_get(item);
165 //delete category from db
166 del_category(_cat);
167diff --git a/src/main.c b/src/main.c
168index 116b84c..89bbb39 100644
169--- a/src/main.c
170+++ b/src/main.c
171@@ -27,7 +27,7 @@
172 #include "db_sqlite.h"
173
174 char home_dir[255], sel_category[255];
175-Elm_Genlist_Item *task_list[500];
176+Elm_Object_Item *task_list[500];
177 Evas_Object *list, *hs, *pr_hs, *date_hs, *entry, *hs1, *tk, *hv, *pr_bt, *cat_list, *win, *cat_hv_bx, *note_win;
178 Evas_Object *c_pr_bt, *cat_dialog, *cat_bt, *sel_cat_bt, *date_bt, *det_page, *entry, *new_button, *note_entry;
179 int total_tasks, WRITE=0, last_rec= -1;
180--
1811.7.8.4
182
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch b/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch
deleted file mode 100644
index 4cd0389cb..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0006-remove-deprecated-API.patch
+++ /dev/null
@@ -1,296 +0,0 @@
1From d1494e2e59d99cd2b7948a870dca00ae789431b9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 20:52:05 +0100
4Subject: [PATCH 6/8] remove deprecated API
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/gui.c | 64 ++++++++++++++++++++++++++++++------------------------------
9 1 files changed, 32 insertions(+), 32 deletions(-)
10
11diff --git a/src/gui.c b/src/gui.c
12index 0291378..c798f75 100644
13--- a/src/gui.c
14+++ b/src/gui.c
15@@ -75,7 +75,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
16 if (last_rec != -1) { //cater for initial null data
17 sprintf(te_data, "%s", (const char *)elm_entry_entry_get(tk));
18 task_entry = strtok(te_data, "<");
19- tsk = (_Task *)elm_genlist_item_data_get(task_list[last_rec]);
20+ tsk = (_Task *)elm_object_item_data_get(task_list[last_rec]);
21 if (strcmp(task_entry, tsk->text) != 0) {
22 sprintf(tsk->text, "%s", task_entry);
23 WRITE = 1;
24@@ -90,7 +90,7 @@ void select_category(void *data, Evas_Object *obj, void *event_info)
25
26 Evas_Object *li = data;
27 item = (Elm_Object_Item *)elm_genlist_selected_item_get(li);
28- tsk = (_Task *)elm_genlist_item_data_get(item);
29+ tsk = (_Task *)elm_object_item_data_get(item);
30 last_rec = tsk->no;
31 elm_object_text_set(cat_bt, tsk->cat);
32 sprintf(tystr, "%d", tsk->pr);
33@@ -117,7 +117,7 @@ void set_priority(void *data, Evas_Object *obj, void *event_info)
34 dummy_pr = atoi(prio);
35 return;
36 }
37- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
38+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
39 if(tsk->pr == ty) return;
40 tsk->pr = ty;
41 WRITE = 1;
42@@ -131,13 +131,13 @@ void set_category(void *data, Evas_Object *obj, void *event_info)
43 item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
44 evas_object_hide(hs);
45 if (!item) return;
46- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
47+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
48 if (strcmp(tsk->cat, category) == 0) return;
49 strcpy(tsk->cat, category);
50 elm_object_text_set(cat_bt, category);
51 WRITE = 1;
52 if (strcmp(sel_category, " All Tasks ") !=0 &&
53- strcmp(sel_category, category) != 0) elm_genlist_item_del(item);
54+ strcmp(sel_category, category) != 0) elm_object_item_del(item);
55 }
56
57 void set_date(void *data, Evas_Object *obj, void *event_info)
58@@ -151,7 +151,7 @@ void set_date(void *data, Evas_Object *obj, void *event_info)
59 strcpy(dummy_date, dt);
60 return;
61 }
62- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
63+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
64 if (strcmp(tsk->date, dt) == 0) return;
65 strcpy(tsk->date, dt);
66 WRITE = 1;
67@@ -167,7 +167,7 @@ void task_cb_changed(void *data, Evas_Object *obj, void *event_info)
68 //printf("no %d key %d\n", tsk->no, tsk->key);
69 //TODO - strike through the task
70 //remove this task from the list
71- elm_genlist_item_del(task_list[tsk->no]);
72+ elm_object_item_del(task_list[tsk->no]);
73 //update the db
74 update_record (tsk->no);
75 last_rec = -1;
76@@ -218,7 +218,7 @@ void set_create_date(void *data, Evas_Object *obj, void *event_info)
77 Details *det = data;
78 evas_object_hide(det->hover);
79 //change date value of selected task
80- _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
81+ _Task *tsk = (_Task *)elm_object_item_data_get(det->item);
82 strcpy(tsk->date, det->data);
83 //update button label
84 elm_object_text_set(det->button, det->data);
85@@ -230,7 +230,7 @@ void set_create_priority(void *data, Evas_Object *obj, void *event_info)
86 Details *det = data;
87 evas_object_hide(det->hover);
88 //change priority value of selected task
89- _Task *tsk = (_Task *)elm_genlist_item_data_get(det->item);
90+ _Task *tsk = (_Task *)elm_object_item_data_get(det->item);
91 tsk->pr = atoi(det->data);
92 //update button label
93 elm_object_text_set(det->button, det->data);
94@@ -295,7 +295,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
95 //check task selected - otherwise return
96 Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
97 if(!item) return;
98- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
99+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
100 det_page = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
101 elm_win_title_set(det_page, "Task Details");
102 elm_win_autodel_set(det_page, 1);
103@@ -322,7 +322,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
104 lb = elm_label_add(det_page);
105 elm_object_text_set(lb,"Edit Task Details");
106 evas_object_size_hint_align_set(lb, 0.5, -1.0);
107- elm_frame_content_set(fr, lb);
108+ elm_object_content_set(fr, lb);
109 evas_object_show(lb);
110
111 //add a label
112@@ -366,7 +366,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
113
114 bt = elm_button_add(det_page);
115 elm_object_text_set(bt, "Pr");
116- elm_hover_content_set(det_hv, "middle", bt);
117+ elm_object_part_content_set(det_hv, "middle", bt);
118 evas_object_show(bt);
119
120 bx = elm_box_add(det_page);
121@@ -384,7 +384,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
122 evas_object_show(bt);
123 }
124 evas_object_show(bx);
125- elm_hover_content_set(det_hv, "bottom", bx);
126+ elm_object_part_content_set(det_hv, "bottom", bx);
127
128 //add a label to hbox
129 lb = elm_label_add(det_page);
130@@ -409,14 +409,14 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
131
132 bt = elm_button_add(det_page);
133 elm_object_text_set(bt, "Category");
134- elm_hover_content_set(hs, "middle", bt);
135+ elm_object_part_content_set(hs, "middle", bt);
136 evas_object_show(bt);
137
138 bx = elm_box_add(det_page);
139 //add categories
140 add_hs_items (det_page, bx, bt, 0);
141 evas_object_show(bx);
142- elm_hover_content_set(hs, "bottom", bx);
143+ elm_object_part_content_set(hs, "bottom", bx);
144
145 //add a label to hbox
146 lb = elm_label_add(det_page);
147@@ -442,7 +442,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
148
149 bt = elm_button_add(det_page);
150 elm_object_text_set(bt, "Date");
151- elm_hover_content_set(c_date_hs, "middle", bt);
152+ elm_object_part_content_set(c_date_hs, "middle", bt);
153 evas_object_show(bt);
154
155 bx = elm_box_add(det_page);
156@@ -486,7 +486,7 @@ void create_details_page(void *data, Evas_Object *obj, void *event_info)
157 evas_object_show(bt);
158
159 evas_object_show(bx);
160- elm_hover_content_set(c_date_hs, "bottom", bx);
161+ elm_object_part_content_set(c_date_hs, "bottom", bx);
162
163 //add a label
164 lb = elm_label_add(det_page);
165@@ -568,7 +568,7 @@ void save_button_clicked(void *data, Evas_Object *obj, void *event_info)
166 //get task no
167 Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
168 if (item) {
169- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
170+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
171
172 //get data from entry
173 sprintf(te_data, "%s", (const char *)elm_entry_entry_get(tk));
174@@ -627,7 +627,7 @@ void note_done(void *data, Evas_Object *obj, void *event_info)
175 //Evas_Object *en = data;
176
177 Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
178- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
179+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
180 sprintf(tystr, "%s", elm_entry_entry_get(data));
181 if (strcmp(tystr, "<br>") == 0) strcpy(tystr, "");
182 strcpy(tsk->note, tystr);
183@@ -643,7 +643,7 @@ void note_button_clicked(void *data, Evas_Object *obj, void *event_info)
184
185 Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(list);
186 if(!item) return;
187- _Task *tsk = (_Task *)elm_genlist_item_data_get(item);
188+ _Task *tsk = (_Task *)elm_object_item_data_get(item);
189
190 note_win = elm_win_add(NULL, "note", ELM_WIN_BASIC);
191 elm_win_title_set(note_win, "Note");
192@@ -721,7 +721,7 @@ void create_cat_hover(void)
193 cat_hv_bx = elm_box_add(win);
194 add_hs_items (win, cat_hv_bx, bt, 1);
195 evas_object_show(cat_hv_bx);
196- elm_hover_content_set(hs1, "top", cat_hv_bx);
197+ elm_object_part_content_set(hs1, "top", cat_hv_bx);
198 evas_object_hide(hs1);
199 }
200
201@@ -880,7 +880,7 @@ void create_gui(Evas_Object *win)
202
203 bt = elm_button_add(win);
204 elm_object_text_set(bt, "Pr");
205- elm_hover_content_set(hv, "middle", bt);
206+ elm_object_part_content_set(hv, "middle", bt);
207 evas_object_show(bt);
208
209 bx = elm_box_add(win);
210@@ -895,7 +895,7 @@ void create_gui(Evas_Object *win)
211 evas_object_show(bt);
212 }
213 evas_object_show(bx);
214- elm_hover_content_set(hv, "bottom", bx);
215+ elm_object_part_content_set(hv, "bottom", bx);
216
217 //add scroller for entry
218 sc = elm_scroller_add(win);
219@@ -911,7 +911,7 @@ void create_gui(Evas_Object *win)
220 elm_entry_entry_set(tk, "Task");
221 evas_object_size_hint_weight_set(tk, 1.0, 0.0);
222 evas_object_size_hint_align_set(tk, -1.0, 0.0);
223- elm_scroller_content_set(sc, tk);
224+ elm_object_content_set(sc, tk);
225 evas_object_show(tk);
226 evas_object_show(sc);
227
228@@ -934,13 +934,13 @@ void create_gui(Evas_Object *win)
229
230 bt = elm_button_add(win);
231 elm_object_text_set(bt, "Date");
232- elm_hover_content_set(date_hs, "middle", bt);
233+ elm_object_part_content_set(date_hs, "middle", bt);
234 evas_object_show(bt);
235
236 bx1 = elm_box_add(win);
237 add_dates(win, bx1, bt);
238 evas_object_show(bx1);
239- elm_hover_content_set(date_hs, "bottom", bx1);
240+ elm_object_part_content_set(date_hs, "bottom", bx1);
241
242 //add save button
243 save_button = elm_button_add(win);
244@@ -957,7 +957,7 @@ void create_gui(Evas_Object *win)
245 evas_object_size_hint_align_set(list, -1.0, -1.0);
246 elm_list_multi_select_set(list, 0);
247 elm_box_pack_end(vbox, list);
248- elm_genlist_horizontal_mode_set(list, ELM_LIST_LIMIT);
249+ elm_genlist_mode_set(list, ELM_LIST_LIMIT);
250 evas_object_show(list);
251 evas_object_smart_callback_add(list, "selected", task_select, list);
252
253@@ -1027,7 +1027,7 @@ void create_gui(Evas_Object *win)
254
255 bt = elm_button_add(win);
256 elm_object_text_set(bt, " All Tasks ");
257- elm_hover_content_set(hs1, "middle", bt);
258+ elm_object_part_content_set(hs1, "middle", bt);
259 evas_object_show(bt);
260 create_cat_hover ();
261
262@@ -1118,7 +1118,7 @@ void create_cat_dialog(void *data, Evas_Object *obj, void *event_info)
263 vbox = elm_box_add(cat_dialog);
264 elm_win_resize_object_add(cat_dialog, vbox);
265 evas_object_size_hint_weight_set(vbox, 1.0, 1.0);
266- elm_win_inwin_content_set(inwin, vbox);
267+ elm_object_content_set(inwin, vbox);
268 evas_object_show(vbox);
269
270 //add hbox to vbox
271@@ -1194,11 +1194,11 @@ void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info)
272 {
273 Evas_Object *li = data;
274 Elm_Object_Item *item = (Elm_Object_Item *)elm_genlist_selected_item_get(li);
275- char *_cat = (char *)elm_genlist_item_data_get(item);
276+ char *_cat = (char *)elm_object_item_data_get(item);
277 //delete category from db
278 del_category(_cat);
279 //remove item from list
280- elm_genlist_item_del(item);
281+ elm_object_item_del(item);
282 create_cat_hover ();
283 if(strcmp(sel_category, _cat) == 0) select_category (" All Tasks ", NULL, NULL);
284 }
285@@ -1263,7 +1263,7 @@ void edit_cat(void)
286 // add a label
287 lb = elm_label_add(cat_win);
288 elm_object_text_set(lb, "Task Categories");
289- elm_frame_content_set(fr, lb);
290+ elm_object_content_set(fr, lb);
291 evas_object_show(lb);
292
293 //add list to vbox now
294--
2951.7.8.4
296
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0007-db_sqlite-fix-warning.patch b/meta-efl/recipes-efl/e17/e-tasks/0007-db_sqlite-fix-warning.patch
deleted file mode 100644
index 409a46454..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0007-db_sqlite-fix-warning.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 8f5979f9c289b4c9313dd93a113ed164d3acb5a2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 21:08:39 +0100
4Subject: [PATCH 7/8] db_sqlite: fix warning
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/db_sqlite.c | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/src/db_sqlite.c b/src/db_sqlite.c
12index 3eb7790..326063e 100644
13--- a/src/db_sqlite.c
14+++ b/src/db_sqlite.c
15@@ -19,7 +19,7 @@
16
17 void open_database(void)
18 {
19- int db_ret, ret;
20+ int db_ret;
21 char db[255];
22
23 sprintf(db, "%s/.tasks/tasks.db", home_dir);
24@@ -28,7 +28,7 @@ void open_database(void)
25 printf("SQL error: %s\n", sqlite3_errmsg(tasks));
26 printf("Creating new db file\n");
27 //exit(1);
28- ret = system("mkdir ~/.tasks");
29+ system("mkdir ~/.tasks");
30 sqlite3_close(tasks);
31 db_ret = sqlite3_open(db, &tasks);
32 }
33--
341.7.8.4
35
diff --git a/meta-efl/recipes-efl/e17/e-tasks/0008-fix-warning-about-incompatible-pointer-types.patch b/meta-efl/recipes-efl/e17/e-tasks/0008-fix-warning-about-incompatible-pointer-types.patch
deleted file mode 100644
index e19f9350e..000000000
--- a/meta-efl/recipes-efl/e17/e-tasks/0008-fix-warning-about-incompatible-pointer-types.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From a9c2240e8ad46a06a4599a444ff8296f5b61b5a9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 14 Feb 2012 21:13:22 +0100
4Subject: [PATCH 8/8] fix warning about incompatible pointer types
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/gui.c | 16 ++++++++--------
9 1 files changed, 8 insertions(+), 8 deletions(-)
10
11diff --git a/src/gui.c b/src/gui.c
12index c798f75..beac463 100644
13--- a/src/gui.c
14+++ b/src/gui.c
15@@ -728,7 +728,7 @@ void create_cat_hover(void)
16 //for genlist
17 Elm_Genlist_Item_Class itc1;
18
19-char *gl_text_get(const void *data, Evas_Object *obj, const char *part)
20+char *gl_text_get(void *data, Evas_Object *obj, const char *part)
21 {
22 _Task *tsk = (_Task *)data;
23 char tystr[255], *ty;
24@@ -739,7 +739,7 @@ char *gl_text_get(const void *data, Evas_Object *obj, const char *part)
25 //return NULL;
26 }
27
28-Evas_Object *gl_content_get(const void *data, Evas_Object *obj, const char *part)
29+Evas_Object *gl_content_get(void *data, Evas_Object *obj, const char *part)
30 {
31 _Task *tsk = (_Task *)data;
32
33@@ -824,12 +824,12 @@ Evas_Object *gl_content_get(const void *data, Evas_Object *obj, const char *part
34 return NULL;
35 }
36
37-Eina_Bool gl_state_get(const void *data, Evas_Object *obj, const char *part)
38+Eina_Bool gl_state_get(void *data, Evas_Object *obj, const char *part)
39 {
40 return 0;
41 }
42
43-void gl_del(const void *data, Evas_Object *obj)
44+void gl_del(void *data, Evas_Object *obj)
45 {
46 return;
47 }
48@@ -1203,24 +1203,24 @@ void del_cat_button_clicked(void *data, Evas_Object *obj, void *event_info)
49 if(strcmp(sel_category, _cat) == 0) select_category (" All Tasks ", NULL, NULL);
50 }
51
52-char *cat_text_get(const void *data, Evas_Object *obj, const char *part)
53+char *cat_text_get(void *data, Evas_Object *obj, const char *part)
54 {
55 char *_cat = (char *)data;
56 char *ty = strdup(_cat);
57 return (ty);
58 }
59
60-Evas_Object *cat_content_get(const void *data, Evas_Object *obj, const char *part)
61+Evas_Object *cat_content_get(void *data, Evas_Object *obj, const char *part)
62 {
63 return NULL;
64 }
65
66-Eina_Bool cat_state_get(const void *data, Evas_Object *obj, const char *part)
67+Eina_Bool cat_state_get(void *data, Evas_Object *obj, const char *part)
68 {
69 return 0;
70 }
71
72-void cat_del (const void *data, Evas_Object *obj)
73+void cat_del (void *data, Evas_Object *obj)
74 {
75 }
76
77--
781.7.8.4
79
diff --git a/meta-efl/recipes-efl/e17/e-tasks_svn.bb b/meta-efl/recipes-efl/e17/e-tasks_git.bb
index 614b2131b..5196f42ab 100644
--- a/meta-efl/recipes-efl/e17/e-tasks_svn.bb
+++ b/meta-efl/recipes-efl/e17/e-tasks_git.bb
@@ -8,21 +8,12 @@ DEPENDS = "elementary eina edbus sqlite3"
8 8
9inherit autotools 9inherit autotools
10 10
11SRCREV = "25" 11SRCREV = "b640f0e7287877983645d9d9a36f85a0b6a54631"
12PV = "0.0.1+svnr${SRCPV}" 12PV = "0.0.2+gitr${SRCPV}"
13PR = "r12"
14 13
15SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \ 14SRC_URI = "git://github.com/shr-project/e-tasks.git;protocol=git;branch=master \
16 file://0001-depend-on-eina-not-eina-0.patch \
17 file://0002-adapt-to-elementary-genlist_item_insert_before-API-c.patch \
18 file://0003-adapt-to-newer-elm-API.patch \
19 file://0004-fix-changed-callback-name.patch \
20 file://0005-adapt-to-even-newer-elm-API.patch \
21 file://0006-remove-deprecated-API.patch \
22 file://0007-db_sqlite-fix-warning.patch \
23 file://0008-fix-warning-about-incompatible-pointer-types.patch \
24" 15"
25S = "${WORKDIR}/trunk" 16S = "${WORKDIR}/git"
26 17
27do_install_append() { 18do_install_append() {
28 install -d "${D}/${datadir}/pixmaps" 19 install -d "${D}/${datadir}/pixmaps"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 20:30:07 +0000