elementary: Fixes copy&paste error and possible invalid memory access.

Patch by Igor Murzov <e-mail@date.by>

SVN revision: 77397

diff --git a/AUTHORS b/AUTHORS
index cbb06e3..3c34010 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -64,3 +64,4 @@ Minseok Kim <minseok3.kim@samsung.com>
 Jean-Philippe André <jpeg@videolan.org>
 JiHyeon Seol <jihyeon.seol@samsung.com>
 Flavio Ceolin <flavio.ceolin@profusion.mobi>
+Igor Murzov <e-mail@date.by>
\ No newline at end of file

diff --git a/ChangeLog b/ChangeLog
index f7770a0..02d8c78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -555,3 +555,8 @@
 
         * add elm_calendar_displayed_time_get
         * add a signal display,changed to elm_calendar
+
+2012-10-04  Igor Murzov
+
+       * fix copy&paste error in elm_flip.
+       * fix possible invalid memory access in elm_access.

diff --git a/NEWS b/NEWS
index bdaff47..83c2476 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@ Fixes:
    * Escape theme filename correctly.
    * Fix diskselector selection of middle item.
    * Fix multibuttonentry list corruption.
+   * Fix copy&paste error in elm_flip.
+   * Fix possible invalid memory access in elm_access.
    
 Removals:
 

diff --git a/src/examples/codegen_example.c b/src/examples/codegen_example.c
index de4d808..aeb11f7 100644 (file)
--- a/src/examples/codegen_example.c
+++ b/src/examples/codegen_example.c
@@ -79,7 +79,7 @@ _button_create(Evas_Object *parent, const char *label)
 EAPI_MAIN int
 elm_main(int argc, char **argv)
 {
-    Evas_Object *win, *bg, *btn, *layout, *tbl_items[3];
+    Evas_Object *win, *bg, *btn, *layout, *tbl_items[6];
     const char *labels[] = {"One", "Two", "Three", "Four", "Five", "Six"};
     int i;
 

diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 8b55500..6a5b868 100644 (file)
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -691,13 +691,13 @@ _access_item_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 EAPI void
 _elm_access_widget_item_register(Elm_Widget_Item *item)
 {
-   Evas_Object *ao;
-   Evas_Object *ho = item->view;
+   Evas_Object *ao, *ho;
    Evas_Coord x, y, w, h;
 
    if (!item) return;
 
    // create access object
+   ho = item->view;
    ao = _elm_access_add(item->widget);
    evas_object_event_callback_add(ho, EVAS_CALLBACK_RESIZE,
                                   _content_resize, ao);

diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index a74ff35..f771718 100644 (file)
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -874,7 +874,7 @@ _flip_show_hide(Evas_Object *obj)
         else
           {
              if (sd->front.content)
-               evas_object_hide(sd->front.clip);
+               evas_object_show(sd->front.clip);
              else
                evas_object_hide(sd->front.clip);
              if (sd->back.content)