Supporting easy mode box size.

[model] Redwood
[binary_type] AP
[customer] Docomo/Orange/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I2281e4f1b6a14af59bbaaa31d42d9ac975e90336

diff --git a/icon_src/main.c b/icon_src/main.c
index d22e215..b76fbfe 100644 (file)
--- a/icon_src/main.c
+++ b/icon_src/main.c
@@ -236,6 +236,15 @@ static inline int convert_shortcut_type_to_lb_type(int shortcut_type, char **str
        case LIVEBOX_TYPE_4x6:
                *str = "4x6";
                return LB_SIZE_TYPE_4x6;
+       case LIVEBOX_TYPE_EASY_1x1:
+               *str = "easy,1x1";
+               return LB_SIZE_TYPE_EASY_1x1;
+       case LIVEBOX_TYPE_EASY_3x1:
+               *str = "easy,3x1";
+               return LB_SIZE_TYPE_EASY_3x1;
+       case LIVEBOX_TYPE_EASY_3x3:
+               *str = "easy,3x3";
+               return LB_SIZE_TYPE_EASY_3x3;
        default:
                *str = "?x?";
                return LB_SIZE_TYPE_UNKNOWN;
@@ -334,6 +343,12 @@ static struct packet *icon_create(pid_t pid, int handle, const struct packet *pa
        destroy_virtual_canvas(e);
 
 out:
+       if (ret < 0) {
+               /* Desc file should be deleted if it fails to create an icon image */
+               if (unlink(desc_file) < 0)
+                       ErrPrint("unlink(%s): %s\n", desc_file, strerror(errno));
+       }
+
        return packet_create_reply(packet, "i", ret);
 }
 

diff --git a/packaging/com.samsung.data-provider-slave.spec b/packaging/com.samsung.data-provider-slave.spec
index 89cb449..5d493a4 100644 (file)
--- a/packaging/com.samsung.data-provider-slave.spec
+++ b/packaging/com.samsung.data-provider-slave.spec
@@ -2,7 +2,7 @@
 
 Name: com.samsung.data-provider-slave
 Summary: Plugin type livebox service provider.
-Version: 0.12.4
+Version: 0.12.5
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License
@@ -43,6 +43,12 @@ Supporting the In-house livebox only.
 %setup -q
 
 %build
+%if 0%{?tizen_build_binary_release_type_eng}
+export CFLAGS="${CFLAGS} -DTIZEN_ENGINEER_MODE"
+export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
+export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
+%endif
+
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 #-fpie  LDFLAGS="${LDFLAGS} -pie -O3"
 CFLAGS="${CFLAGS} -Wall -Winline -Werror -fno-builtin-malloc" make %{?jobs:-j%jobs}