tizen 2.4 release accepted/tizen_2.4_mobile tizen_2.4 accepted/tizen/2.4/mobile/20151029.031004 submit/tizen_2.4/20151028.064953 tizen_2.4_mobile_release
authorjk7744.park <jk7744.park@samsung.com>
Sat, 24 Oct 2015 08:14:34 +0000 (17:14 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Sat, 24 Oct 2015 08:14:34 +0000 (17:14 +0900)
access_output_tts/configure.ac
access_output_tts/src/mod.c
edje_feedback/configure.ac
edje_feedback/feedback.c
naviframe_effect/Makefile.am [deleted file]
naviframe_effect/autogen.sh [deleted file]
naviframe_effect/configure.ac [deleted file]
naviframe_effect/naviframe_effect.c [deleted file]
packaging/elm-modules.spec

index d52a62f..61cbe60 100644 (file)
@@ -26,7 +26,7 @@ PKG_CHECK_MODULES(ACCESS_OUTPUT, [${requirements}])
 
 # Check host system
 ELEMENTARY_VERSION=`$PKG_CONFIG --modversion elementary | awk -F . '{printf("%s.%s.%s",$1,$2,$3);}'`
-MODULE_ARCH="$host_os-$host_cpu-$ELEMENTARY_VERSION"
+MODULE_ARCH="v-$ELEMENTARY_VERSION"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
index 630cf21..40a7dad 100644 (file)
@@ -59,6 +59,8 @@ static Eina_Bool _text_add(const char *txt)
       return EINA_TRUE;
    }
 
+   if(txt == NULL) return EINA_FALSE;
+
    if (strlen(txt) < TEXT_CUT_SIZE)
      {
         ret = tts_add_text(tts, txt, NULL, TTS_VOICE_TYPE_AUTO,
@@ -66,14 +68,14 @@ static Eina_Bool _text_add(const char *txt)
      }
    else
      {
-        char tmp[TEXT_CUT_SIZE + 2];
+        char tmp[TEXT_CUT_SIZE + 1];
         int i, p = 0;
 
         while (strlen(&txt[p]) > TEXT_CUT_SIZE)
           {
              strncpy(tmp, &txt[p], TEXT_CUT_SIZE);
 
-             for (i = 1; i < TEXT_CUT_SIZE ; i++)
+             for (i = 1; i < TEXT_CUT_SIZE - 1 ; i++)
                {
                   if (tmp[i] == ' ' &&
                       (tmp[i - 1] == '?' ||
@@ -118,7 +120,9 @@ void _tts_state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e current,
         if (!eina_strbuf_length_get(buf)) return;
 
         txt = eina_strbuf_string_steal(buf);
-        if (!txt || strlen(txt) == 0) return;
+        eina_strbuf_free(buf);
+
+        if (txt && strlen(txt) == 0) return;
 
         if (_text_add(txt) == EINA_FALSE) return;
 
index 5e05822..e4ed502 100644 (file)
@@ -22,8 +22,8 @@ requirements="eina, edje, feedback"
 PKG_CHECK_MODULES(EDJE_FEEDBACK, [${requirements}])
 
 # Check host system
-VERSION=1.0.0
-MODULE_ARCH="$host_os-$host_cpu-$VERSION"
+VERSION=1.13
+MODULE_ARCH="v-$VERSION"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
index 8d71ea9..37a58d9 100644 (file)
@@ -17,6 +17,7 @@
 #include <eina_module.h>
 #include <Edje.h>
 #include <feedback.h>
+#include <feedback-internal.h>
 
 static int _edje_feedback_log_dom = -1;
 static int _init_count = 0;
@@ -50,7 +51,7 @@ static Eina_Bool _init_feedback = EINA_FALSE;
 extern "C" {
 #endif
 
-EAPI Eina_Bool
+EXPORTAPI Eina_Bool
 edje_plugin_run(Evas_Object *edje,
                 const char *name,
                 const char *param)
@@ -82,6 +83,7 @@ edje_plugin_run(Evas_Object *edje,
           }
         return EINA_TRUE;
      }
+   free(tok);
    return EINA_FALSE;
 }
 
diff --git a/naviframe_effect/Makefile.am b/naviframe_effect/Makefile.am
deleted file mode 100755 (executable)
index a148cae..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-pkgdir = $(libdir)/elementary/modules/naviframe_effect/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = naviframe_effect.c
-module_la_CPPFLAGS = @NAVIFRAME_EFFECT_CFLAGS@
-
-module_la_LIBADD = @NAVIFRAME_EFFECT_LIBS@
-
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/naviframe_effect/autogen.sh b/naviframe_effect/autogen.sh
deleted file mode 100755 (executable)
index 5a30991..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-set  -x
-aclocal
-autoconf
-libtoolize --copy --force
-autoheader
-automake --foreign --add-missing --copy
-
diff --git a/naviframe_effect/configure.ac b/naviframe_effect/configure.ac
deleted file mode 100644 (file)
index b00a0ec..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# initialization
-AC_INIT([elm-modules-navframe_effect], [1.0], [BUG-REPORT-ADDRESS])
-AM_INIT_AUTOMAKE([-Wall foreign])
-
-# checks for programs
-AC_PROG_CC
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
-# checks for header files
-AC_HEADER_STDC
-
-# checks for typedefs, structures, and compiler characteristics
-AC_C_CONST
-
-# checks for pkg-config
-PKG_PROG_PKG_CONFIG
-
-requirements="elementary"
-
-PKG_CHECK_MODULES(NAVIFRAME_EFFECT, [${requirements}])
-
-# Check host system
-ELEMENTARY_VERSION=`$PKG_CONFIG --modversion elementary | awk -F . '{printf("%s.%s.%s",$1,$2,$3);}'`
-MODULE_ARCH="$host_os-$host_cpu-$ELEMENTARY_VERSION"
-AC_SUBST(MODULE_ARCH)
-AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
-
-# Generate files
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/naviframe_effect/naviframe_effect.c b/naviframe_effect/naviframe_effect.c
deleted file mode 100644 (file)
index 5c3353c..0000000
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <elementary_config.h>
-#endif
-
-#include <Elementary.h>
-#include <elm_widget_naviframe.h>
-
-struct custom_effect
-{
-   Evas_Object *obj;
-   Evas_Coord   w, h;
-   Evas_Map    *map;
-
-   struct _effect
-     {
-        double zoom;
-        int    alpha;
-     }from, to;
-};
-
-//Tizen Only
-#ifdef ELM_FEATURE_WEARABLE_RECTANGLE
-static void
-_tizen_transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Elm_Naviframe_Item *it = data;
-
-   it->tizen_transit = NULL;
-}
-
-static void
-_tizen_transit_del_cb2(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Evas_Coord x, y, w, h;
-   Elm_Naviframe_Item *it = data;
-
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
-   evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
-   it->tizen_transit2 = NULL;
-}
-
-EAPI void
-tizen_pop_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit, *transit2;
-
-   if (!it->tizen_zoom) return;
-
-   if (it->tizen_transit)
-     {
-        elm_transit_del(it->tizen_transit);
-        it->tizen_transit = NULL;
-     }
-
-   if (it->tizen_transit2)
-     {
-        elm_transit_del(it->tizen_transit2);
-        it->tizen_transit2 = NULL;
-     }
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   transit2 = elm_transit_add();
-   if (!transit2)
-     {
-        elm_transit_del(transit);
-        return;
-     }
-
-   it->tizen_transit = transit;
-   it->tizen_transit2 = transit2;
-
-   //Transition for zoom 0.92 times
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_zoom_add(transit, 0.92, 0.92);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL);
-   elm_transit_tween_mode_factor_set(transit, 1.7, 0.0);
-   elm_transit_duration_set(transit, 0.05);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_del_cb, it);
-
-   //Transition for zoom from 0.92 to 1.0 times
-   elm_transit_object_add(transit2, VIEW(it));
-   elm_transit_effect_zoom_add(transit2, 0.92, 1.0);
-   elm_transit_tween_mode_set(transit2, ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL);
-   elm_transit_tween_mode_factor_set(transit2, 1.7, 0.0);
-   elm_transit_duration_set(transit2, 0.2);
-   elm_transit_smooth_set(transit2, EINA_FALSE);
-   elm_transit_del_cb_set(transit2, _tizen_transit_del_cb2, it);
-
-   elm_transit_chain_transit_add(transit, transit2);
-   elm_transit_go(transit);
-}
-
-EAPI void
-tizen_push_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit, *transit2;
-
-   if (!it->tizen_zoom) return;
-
-   if (it->tizen_transit)
-     {
-        elm_transit_del(it->tizen_transit);
-        it->tizen_transit = NULL;
-     }
-
-   if (it->tizen_transit2)
-     {
-        elm_transit_del(it->tizen_transit2);
-        it->tizen_transit2 = NULL;
-     }
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   transit2 = elm_transit_add();
-   if (!transit2)
-     {
-        elm_transit_del(transit);
-        return;
-     }
-
-   it->tizen_transit = transit;
-   it->tizen_transit2 = transit2;
-
-   //Transition for zoom from 1.0 to 0.92 times
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_zoom_add(transit, 1.0, 0.92);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL);
-   elm_transit_tween_mode_factor_set(transit, 1.7, 0.0);
-   elm_transit_duration_set(transit, 0.2);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_del_cb, it);
-
-   //Transition for zoom 0.92 times
-   elm_transit_object_add(transit2, VIEW(it));
-   elm_transit_effect_zoom_add(transit2, 0.92, 0.92);
-   elm_transit_tween_mode_set(transit2, ELM_TRANSIT_TWEEN_MODE_SINUSOIDAL);
-   elm_transit_tween_mode_factor_set(transit2, 1.7, 0.0);
-   elm_transit_duration_set(transit2, 0.05);
-   elm_transit_smooth_set(transit2, EINA_FALSE);
-   elm_transit_del_cb_set(transit2, _tizen_transit_del_cb2, it);
-
-   elm_transit_chain_transit_add(transit, transit2);
-   elm_transit_go(transit);
-}
-#elif ELM_FEATURE_WEARABLE_CIRCLE
-static void
-_tizen_transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Evas_Coord x, y, w, h;
-   Elm_Naviframe_Item *it = data;
-
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
-   evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
-   it->tizen_transit = NULL;
-}
-
-static void
-_tizen_transit_pop_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Elm_Naviframe_Item *it = data;
-   Evas_Coord x, y, w, h;
-
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
-   evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
-   it->tizen_transit = NULL;
-}
-
-// TIZEN ONLY
-static Elm_Transit_Effect *
-_custom_context_new(Evas_Object *obj,
-                    double from_zoom, double to_zoom,
-                    int from_alpha, int to_alpha)
-{
-   Evas_Coord w, h;
-   Evas_Map *map;
-
-   if (!obj) return NULL;
-
-   struct custom_effect *custom_effect = calloc(1, sizeof(struct custom_effect));
-   if (!custom_effect) return NULL;
-
-   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-   map = evas_map_new(4);
-
-   custom_effect->obj = obj;
-   custom_effect->w = w;
-   custom_effect->h = h;
-   custom_effect->map = map;
-   custom_effect->from.zoom = from_zoom;
-   custom_effect->from.alpha = from_alpha;
-   custom_effect->to.zoom = to_zoom;
-   custom_effect->to.alpha = to_alpha;
-
-   return custom_effect;
-}
-
-static void
-_custom_context_free(Elm_Transit_Effect *effect,
-                                 Elm_Transit *transit EINA_UNUSED)
-{
-   struct custom_effect *custom_effect = effect;
-   evas_map_free(custom_effect->map);
-   free(custom_effect);
-}
-
-static void
-_custom_op(Elm_Transit_Effect *effect, Elm_Transit *transit EINA_UNUSED,
-           double progress)
-{
-   if (!effect) return;
-
-   Evas_Coord w, h;
-   Evas_Map *map;
-   double zoom;
-   int color;
-
-   struct custom_effect *custom_effect = (struct custom_effect *) effect;
-
-   zoom = (custom_effect->from.zoom * (1.0 - progress)) + (custom_effect->to.zoom * progress);
-   w = (Evas_Coord) (custom_effect->w * zoom);
-   h = (Evas_Coord) (custom_effect->h * zoom);
-
-   map = custom_effect->map;
-   evas_map_util_points_populate_from_object_full(map, custom_effect->obj, 0);
-
-   color = (int) ((custom_effect->from.alpha * (1.0 - progress)) +
-                  (custom_effect->to.alpha * progress));
-   evas_map_point_color_set(map, 0, color, color, color, color);
-   evas_map_point_color_set(map, 1, color, color, color, color);
-   evas_map_point_color_set(map, 2, color, color, color, color);
-   evas_map_point_color_set(map, 3, color, color, color, color);
-   evas_map_util_zoom(map, (double) w / custom_effect->w, (double) h / custom_effect->h,
-                      custom_effect->w / 2, custom_effect->h / 2);
-
-   evas_map_smooth_set(map, EINA_FALSE);
-   evas_object_map_enable_set(custom_effect->obj, EINA_TRUE);
-   evas_object_map_set(custom_effect->obj, map);
-}
-
-EAPI void
-tizen_pop_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit;
-   Elm_Transit_Effect *effect_context;
-
-   if (!it->tizen_zoom) return;
-   if (it->tizen_transit) elm_transit_del(it->tizen_transit);
-   it->tizen_transit = NULL;
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   it->tizen_transit = transit;
-
-   effect_context = _custom_context_new(VIEW(it), 1.0, 0.0, 255, 255);
-   if (!effect_context) return;
-
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_add(transit, _custom_op, effect_context, _custom_context_free);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
-   elm_transit_duration_set(transit, 0.3);
-   elm_transit_objects_final_state_keep_set(transit, EINA_TRUE);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_pop_del_cb, it);
-   elm_transit_go(transit);
-}
-
-EAPI void
-tizen_push_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit;
-   Elm_Transit_Effect *effect_context;
-
-   if (!it->tizen_zoom) return;
-
-   if (it->tizen_transit) elm_transit_del(it->tizen_transit);
-   it->tizen_transit = NULL;
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   it->tizen_transit = transit;
-
-   effect_context = _custom_context_new(VIEW(it), 0.0, 1.0, 255, 255);
-   if (!effect_context) return;
-
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_add(transit, _custom_op, effect_context, _custom_context_free);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
-   elm_transit_duration_set(transit, 0.3);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_del_cb, it);
-   elm_transit_go(transit);
-}
-#else /* mobile */
-static void
-_tizen_transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Evas_Coord x, y, w, h;
-   Elm_Naviframe_Item *it = data;
-
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
-   evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
-   it->tizen_transit = NULL;
-}
-
-static void
-_tizen_transit_pop_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
-{
-   Elm_Naviframe_Item *it = data;
-   Evas_Coord x, y, w, h;
-
-   evas_object_geometry_get(WIDGET(it), &x, &y, &w, &h);
-   evas_object_move(VIEW(it), x, y);
-   evas_object_resize(VIEW(it), w, h);
-   evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
-   it->tizen_transit = NULL;
-}
-
-//Tizen Only
-static Elm_Transit_Effect *
-_custom_context_new(Evas_Object *obj,
-                    double from_zoom, double to_zoom,
-                    int from_alpha, int to_alpha)
-{
-   Evas_Coord w, h;
-   Evas_Map *map;
-
-   if (!obj) return NULL;
-
-   struct custom_effect *custom_effect = calloc(1, sizeof(struct custom_effect));
-   if (!custom_effect) return NULL;
-
-   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-   map = evas_map_new(4);
-
-   custom_effect->obj = obj;
-   custom_effect->w = w;
-   custom_effect->h = h;
-   custom_effect->map = map;
-   custom_effect->from.zoom = from_zoom;
-   custom_effect->from.alpha = from_alpha;
-   custom_effect->to.zoom = to_zoom;
-   custom_effect->to.alpha = to_alpha;
-
-   return custom_effect;
-}
-
-static void
-_custom_context_free(Elm_Transit_Effect *effect,
-                                 Elm_Transit *transit EINA_UNUSED)
-{
-   struct custom_effect *custom_effect = effect;
-   evas_map_free(custom_effect->map);
-   free(custom_effect);
-}
-
-static void
-_custom_op(Elm_Transit_Effect *effect, Elm_Transit *transit EINA_UNUSED,
-           double progress)
-{
-   if (!effect) return;
-
-   Evas_Coord w, h;
-   Evas_Map *map;
-   double zoom;
-   int color;
-
-   struct custom_effect *custom_effect = (struct custom_effect *) effect;
-
-   zoom = (custom_effect->from.zoom * (1.0 - progress)) + (custom_effect->to.zoom * progress);
-   w = (Evas_Coord) (custom_effect->w * zoom);
-   h = (Evas_Coord) (custom_effect->h * zoom);
-
-   map = custom_effect->map;
-   evas_map_util_points_populate_from_object_full(map, custom_effect->obj, 0);
-
-   color = (int) ((custom_effect->from.alpha * (1.0 - progress)) +
-                  (custom_effect->to.alpha * progress));
-   evas_map_point_color_set(map, 0, color, color, color, color);
-   evas_map_point_color_set(map, 1, color, color, color, color);
-   evas_map_point_color_set(map, 2, color, color, color, color);
-   evas_map_point_color_set(map, 3, color, color, color, color);
-   evas_map_util_zoom(map, (double) w / custom_effect->w, (double) h / custom_effect->h,
-                      custom_effect->w / 2, custom_effect->h / 2);
-
-   evas_map_smooth_set(map, EINA_FALSE);
-   evas_object_map_enable_set(custom_effect->obj, EINA_TRUE);
-   evas_object_map_set(custom_effect->obj, map);
-}
-
-EAPI void
-tizen_pop_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit;
-   Elm_Transit_Effect *effect_context;
-
-   if (!it->tizen_zoom) return;
-   if (it->tizen_transit) elm_transit_del(it->tizen_transit);
-   it->tizen_transit = NULL;
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   it->tizen_transit = transit;
-
-   effect_context = _custom_context_new(VIEW(it), 1.0, 0.8, 255, 0);
-   if (!effect_context) return;
-
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_add(transit, _custom_op, effect_context, _custom_context_free);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
-   elm_transit_duration_set(transit, 0.3);
-   elm_transit_objects_final_state_keep_set(transit, EINA_TRUE);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_pop_del_cb, it);
-   elm_transit_go(transit);
-}
-
-EAPI void
-tizen_push_effect(Elm_Naviframe_Item *it)
-{
-   Elm_Transit *transit;
-   Elm_Transit_Effect *effect_context;
-
-   if (!it->tizen_zoom) return;
-
-   if (it->tizen_transit) elm_transit_del(it->tizen_transit);
-   it->tizen_transit = NULL;
-
-   transit = elm_transit_add();
-   if (!transit) return;
-
-   it->tizen_transit = transit;
-
-   effect_context = _custom_context_new(VIEW(it), 0.8, 1.0, 0, 255);
-   if (!effect_context) return;
-
-   elm_transit_object_add(transit, VIEW(it));
-   elm_transit_effect_add(transit, _custom_op, effect_context, _custom_context_free);
-   elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
-   elm_transit_duration_set(transit, 0.3);
-   elm_transit_smooth_set(transit, EINA_FALSE);
-   elm_transit_del_cb_set(transit, _tizen_transit_del_cb, it);
-   elm_transit_go(transit);
-}
-#endif
-
-EAPI void
-obj_hide(Elm_Naviframe_Item *module_data EINA_UNUSED)
-{
-   return;
-}
-
-// module api funcs needed
-EAPI int
-elm_modapi_init(void *m EINA_UNUSED)
-{
-   return 1; // succeed always
-}
-
-EAPI int
-elm_modapi_shutdown(void *m EINA_UNUSED)
-{
-   return 1; // succeed always
-}
index beb6b44..692d406 100644 (file)
@@ -1,6 +1,6 @@
 Name:       elm-modules
 Summary:    The Elementary Modules
-Version:    0.1.25
+Version:    0.1.27
 Release:    1
 Group:      System/Libraries
 License:    Flora-1.1
@@ -10,7 +10,6 @@ BuildRequires: elementary-devel, eina-devel, edje-devel
 BuildRequires: tts-devel, libfeedback-devel
 BuildRequires: pkgconfig(mm-keysound)
 BuildRequires: pkgconfig(vconf)
-BuildRequires: model-build-features
 
 %description
 The Elementary Modules
@@ -22,18 +21,7 @@ The Elementary Modules
 export CFLAGS+=" -fvisibility=hidden -fPIC -Wall"
 export LDFLAGS+=" -fvisibility=hidden -Wl,--hash-style=both -Wl,--as-needed -Wl,-z,defs"
 
-%if "%{?tizen_profile_name}" == "wearable"
-    export CFLAGS+=" -DELM_FEATURE_WEARABLE"
-    %if "%{?model_build_feature_formfactor}" == "circle"
-        export CFLAGS+=" -DELM_FEATURE_WEARABLE_CIRCLE"
-    %else
-        export CFLAGS+=" -DELM_FEATURE_WEARABLE_RECTANGLE"
-    %endif
-%else
-    export CFLAGS+=" -DELM_FEATURE_LITE"
-%endif
-
-%define DEF_SUBDIRS access_output_tts edje_feedback naviframe_effect
+%define DEF_SUBDIRS access_output_tts edje_feedback
 for FILE in %{DEF_SUBDIRS}
 do
     cd $FILE