From: Mike McCormack <mj.mccormack@samsung.com>
Date: Wed, 23 Nov 2011 02:32:16 +0000 (+0900)
Subject: [video] Sync with upstream
X-Git-Tag: REL_F_I9500_20111128_2~81
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a64407ae0cb32e074e78fce72058dd9abba1ad6a;p=framework%2Fuifw%2Felementary.git

[video] Sync with upstream
---

diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index d893fef..cb90a85 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -279,14 +279,13 @@ elm_video_add(Evas_Object *parent)
    wd->layout = edje_object_add(e);
    _elm_theme_object_set(obj, wd->layout, "video", "base", "default");
    elm_widget_resize_object_set(obj, wd->layout);
-   elm_widget_sub_object_add(obj, wd->layout);
    evas_object_show(wd->layout);
    evas_object_size_hint_weight_set(wd->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
    wd->emotion = emotion_object_add(e);
    emotion_object_init(wd->emotion, NULL);
-   edje_object_part_swallow(wd->layout, "elm.swallow.video", wd->emotion);
    elm_widget_sub_object_add(obj, wd->emotion);
+   edje_object_part_swallow(wd->layout, "elm.swallow.video", wd->emotion);
 
    evas_object_smart_callback_add(wd->emotion, "open_done", _open_done, obj);
    evas_object_smart_callback_add(wd->emotion, "playback_started", _playback_started, obj);