summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--NEWS3
-rw-r--r--src/lib/edje/edje_cache.c10
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c3dea3a93..b9c4c2859c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12013-11-20 Cedric Bail 12013-11-20 Cedric Bail
2 2
3 * Eina: Fix a possible race condition during eina_file_close. 3 * Eina: Fix a possible race condition during eina_file_close.
4 * Edje: Fix use of eina_hash_pointer to actually look at the pointer.
4 5
52013-11-19 Tom Hacohen 62013-11-19 Tom Hacohen
6 7
diff --git a/NEWS b/NEWS
index 5ce9bcf17b..01803f8a69 100644
--- a/NEWS
+++ b/NEWS
@@ -435,7 +435,8 @@ Fixes:
435 - Fix size calculation of flags of signal callbacks 435 - Fix size calculation of flags of signal callbacks
436 - Check for both Lua 5.1 and 5.2. 436 - Check for both Lua 5.1 and 5.2.
437 - Fixed memory leak in the edje map color transition. 437 - Fixed memory leak in the edje map color transition.
438 - Add null checking for name of anchor and item in geometry get functions. 438 - Add null checking for name of anchor and item in geometry get functions.
439 - Fix use of eina_hash_pointer to actually look at the pointer value.
439 440
440 * Efreet: 441 * Efreet:
441 - Fix desktop command parsing of https. 442 - Fix desktop command parsing of https.
diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c
index f2e9b20fad..607eff5044 100644
--- a/src/lib/edje/edje_cache.c
+++ b/src/lib/edje/edje_cache.c
@@ -388,7 +388,7 @@ _edje_file_dangling(Edje_File *edf)
388 if (edf->dangling) return; 388 if (edf->dangling) return;
389 edf->dangling = EINA_TRUE; 389 edf->dangling = EINA_TRUE;
390 390
391 eina_hash_del(_edje_file_hash, edf->f, edf); 391 eina_hash_del(_edje_file_hash, &edf->f, edf);
392 if (!eina_hash_population(_edje_file_hash)) 392 if (!eina_hash_population(_edje_file_hash))
393 { 393 {
394 eina_hash_free(_edje_file_hash); 394 eina_hash_free(_edje_file_hash);
@@ -411,7 +411,7 @@ _edje_cache_file_coll_open(const Eina_File *file, const char *coll, int *error_r
411 goto find_list; 411 goto find_list;
412 } 412 }
413 413
414 edf = eina_hash_find(_edje_file_hash, file); 414 edf = eina_hash_find(_edje_file_hash, &file);
415 if (edf) 415 if (edf)
416 { 416 {
417 edf->references++; 417 edf->references++;
@@ -425,7 +425,7 @@ find_list:
425 { 425 {
426 edf->references = 1; 426 edf->references = 1;
427 _edje_file_cache = eina_list_remove_list(_edje_file_cache, l); 427 _edje_file_cache = eina_list_remove_list(_edje_file_cache, l);
428 eina_hash_direct_add(_edje_file_hash, file, edf); 428 eina_hash_direct_add(_edje_file_hash, &edf->f, edf);
429 goto open; 429 goto open;
430 } 430 }
431 } 431 }
@@ -439,7 +439,7 @@ find_list:
439 (void) ed; 439 (void) ed;
440#endif 440#endif
441 441
442 eina_hash_direct_add(_edje_file_hash, file, edf); 442 eina_hash_direct_add(_edje_file_hash, &edf->f, edf);
443 /* return edf; */ 443 /* return edf; */
444 444
445open: 445open:
@@ -654,7 +654,7 @@ _edje_cache_file_unref(Edje_File *edf)
654 return; 654 return;
655 } 655 }
656 656
657 eina_hash_del(_edje_file_hash, edf->f, edf); 657 eina_hash_del(_edje_file_hash, &edf->f, edf);
658 if (!eina_hash_population(_edje_file_hash)) 658 if (!eina_hash_population(_edje_file_hash))
659 { 659 {
660 eina_hash_free(_edje_file_hash); 660 eina_hash_free(_edje_file_hash);