[TSAM-797] Modify EDJ installation path and avoid crash

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b49d76..2e46f90 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,8 +100,8 @@ ADD_CUSTOM_COMMAND(OUTPUT attach-panel-gallery-images.edj
 ADD_CUSTOM_TARGET(gallery_efl_edj_build DEPENDS attach-panel-gallery.edj attach-panel-gallery-images.edj)
 ADD_DEPENDENCIES(${PROJECT_NAME} gallery_efl_edj_build)
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/attach-panel-gallery.edj DESTINATION ${RESDIR}/edje/attach-panel-gallery)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/attach-panel-gallery-images.edj DESTINATION ${RESDIR}/edje/attach-panel-gallery)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/attach-panel-gallery.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/attach-panel-gallery-images.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME})
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/${GE_IMG_C_DIR} DESTINATION ${RESDIR}/images/attach-panel-gallery)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})

diff --git a/packaging/attach-panel-gallery.spec b/packaging/attach-panel-gallery.spec
index a929498..77a63f7 100644 (file)
--- a/packaging/attach-panel-gallery.spec
+++ b/packaging/attach-panel-gallery.spec
@@ -73,7 +73,7 @@ ln -sf /usr/bin/ug-client %{TZ_SYS_RO_UG}/bin/attach-panel-gallery
 %manifest attach-panel-gallery.manifest
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_UG}/lib/libug-attach-panel-gallery.so*
-%{TZ_SYS_RO_UG}/res/edje/attach-panel-gallery/*
+%{TZ_SYS_RO_UG}/res/edje/ug-attach-panel-gallery/*
 %{TZ_SYS_RO_UG}/res/images/attach-panel-gallery/*
 %{TZ_SYS_RO_UG}/res/locale/*/*/attach-panel-gallery.mo
 %{TZ_SYS_RO_PACKAGES}/attach-panel-gallery.xml

diff --git a/src/util/ge-ui-util.c b/src/util/ge-ui-util.c
index 34386b2..bdb7497 100644 (file)
--- a/src/util/ge-ui-util.c
+++ b/src/util/ge-ui-util.c
@@ -84,6 +84,7 @@ Evas_Object* ge_ui_load_edj(Evas_Object *parent, const char *file, const char *g
        if (eo) {
                r = elm_layout_file_set(eo, file, group);
                if (!r) {
+                       ge_dbg("failed to load layout");
                        evas_object_del(eo);
                        return NULL;
                }

diff --git a/src/view/ge-gridview.c b/src/view/ge-gridview.c
index 4a041a7..27e0841 100644 (file)
--- a/src/view/ge-gridview.c
+++ b/src/view/ge-gridview.c
@@ -1790,6 +1790,8 @@ GE_GRID_FAILED:
 
 void _ge_grid_change_selection_mode(ge_ugdata *ugd, bool state)
 {
+       GE_CHECK(ugd);
+       GE_CHECK(ugd->thumbs_d);
        ge_dbg("changing selection type and mode is %d", _ge_get_view_mode(ugd));
 #if 0
        ugd->selected_elist = NULL;