Release version 0.2.20

1. Fix build error on wearable profile - without WAYLAND feature

Change-Id: I5110ba080fb99f7e44e957041d3c1607c99b3a53
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 040200b..4a7a777 100644 (file)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.2.19
+Version:    0.2.20
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index bebeb13..b3a5e3a 100755 (executable)
--- a/src/camera.c
+++ b/src/camera.c
@@ -1231,11 +1231,12 @@ ErrorExit:
                }
                _camera_remove_idle_event_all(pc->cb_info);
                _client_callback_destroy(pc->cb_info);
-
+#ifdef HAVE_WAYLAND
                if (pc->wl_info) {
                        g_free(pc->wl_info);
                        pc->wl_info = NULL;
                }
+#endif /* HAVE_WAYLAND */
 
                g_free(pc);
                pc = NULL;
@@ -1818,12 +1819,14 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ
                        }
                }
 
+#ifdef HAVE_WAYLAND
                if (pc->wl_info) {
                        g_free(pc->wl_info);
                        pc->wl_info = NULL;
                }
 
                pc->wl_info = wl_info;
+#endif /* HAVE_WAYLAND */
 
                return CAMERA_ERROR_NONE;;
        } else {
@@ -1832,10 +1835,12 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ
        }
 
 _SET_DISPLAY_ERROR:
+#ifdef HAVE_WAYLAND
        if (wl_info) {
                g_free(wl_info);
                wl_info = NULL;
        }
+#endif /* HAVE_WAYLAND */
 
        return __convert_camera_error_code(__func__, ret);
 }