Merge missing code from 2.4 branch

Change-Id: Iab92a6d4c8d85b8b98e494dc3435c0b77b7ec741
Signed-off-by: Prakash <prakashc.p@samsung.com>

diff --git a/src/features/gl-main.c b/src/features/gl-main.c
index 7002ebdfe2cc1f0a513ef993e37b21dabacc14e3..bbf0537ea2238b60d533625bff81af257291ccf1 100644 (file)
--- a/src/features/gl-main.c
+++ b/src/features/gl-main.c
@@ -396,9 +396,7 @@ int _gl_main_create_view(gl_appdata *ad)
        GL_CHECK_VAL(ad->maininfo.bg, -1);
        /*gallery should appear on phone side when target works on desktop mode*/
        const char *str = "mobile";
-#if 0
-       elm_win_profiles_set(ad->maininfo.win, &str, 1);
-#endif
+
        /*
         * Set Opacity before Conformant window create
         * When create Conformant Window, it will read currect Opacity and auto send it.

diff --git a/widget/src/gl_widget_main.c b/widget/src/gl_widget_main.c
index d80397f336fbbafbc91fd681ac7d1c104912a138..caf04491d986a29097f92db6a2d971e9471333bf 100644 (file)
--- a/widget/src/gl_widget_main.c
+++ b/widget/src/gl_widget_main.c
@@ -94,6 +94,15 @@ int widget_Destroy(widget_context_h context, widget_app_destroy_type_e reason, b
        if (widget_data->timer) {
                ecore_timer_del(widget_data->timer);
        }
+       if (widget_data->selected_images) {
+               int i = 0;
+               for (i = 0; i < widget_data->selected_count; i++) {
+                       if (widget_data->selected_images[i]) {
+                               free(widget_data->selected_images[i]);
+                       }
+               }
+               free(widget_data->selected_images);
+       }
        free(widget_data);
 
        remove("/opt/usr/media/selectedimages.eet");