Merge "[genlist] fix the blinking bug, change animation effect"

diff --git a/debian/changelog b/debian/changelog
index f85761b..26edf0e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+elementary (1.0.0+svn.58393slp2+build27) unstable; urgency=low
+
+  * Package Upload : temporary modification for setting theme property
+  * Git: 165.213.180.234:/slp/pkgs/e/elementary
+  * Tag: elementary_1.0.0+svn.58393slp2+build27
+
+ -- Shinwoo Kim <cinoo.kim@samsung.com>  Mon, 20 Jun 2011 21:47:17 +0900
+
 elementary (1.0.0+svn.58393slp2+build26) unstable; urgency=low
 
   * Package Upload : elm_notify is merged with open source

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index b79f112..39b6239 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -824,10 +824,10 @@ _set_EFL_item_data(PItemTagData data, const char *tag_str)
              strcat(modify, path);
              data->href = modify;
              cnp_debug("image href ---%s---\n", data->href);
+             free(value);
           }
         else
           freeAndAssign(data->href, value);
-        free(value);
      }
 
    value = _get_tag_value(tag_str, "absize");
@@ -906,10 +906,10 @@ _set_HTML_img_data(PItemTagData data, const char *tag_str)
              strcat(modify, path);
              data->href = modify;
              cnp_debug("image src ---%s---\n", data->href);
+             free(value);
           }
         else
           freeAndAssign(data->href, value);
-        free(value);
      }
 
    value = _get_tag_value(tag_str, "width");
@@ -1112,7 +1112,8 @@ _convert_to_edje(Eina_List* nodes)
                             else if (!strcmp(_HTMLtoEFLConvertTable[j].src, "img"))
                               {
                                  PItemTagData data = trail->tagData;
-                                 char *width = IMAGE_DEFAULT_WIDTH, *height = IMAGE_DEFAULT_HEIGHT;                                 if (data->width)
+                                 char *width = IMAGE_DEFAULT_WIDTH, *height = IMAGE_DEFAULT_HEIGHT;
+                                 if (data->width)
                                    width = data->width;
                                  if (data->height)
                                    height = data->height;

diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index 736f6e1..5f46dc2 100644 (file)
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -727,6 +727,8 @@ elm_theme_all_set(const char *theme)
    if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_THEME");
    ecore_x_window_prop_string_set(ecore_x_window_root_first_get(),
                                   atom, theme);
+   //FIXME - ecore_x_window_prop_string_set() works properly only after ecore_x_window_prop_string_get() is called.
+   ecore_x_window_prop_string_get(ecore_x_window_root_first_get(), atom);
 #endif
    elm_theme_set(NULL, theme);
 }