diff options
| author | Hyunho Kang <hhstark.kang@samsung.com> | 2016-12-12 17:25:17 +0900 |
|---|---|---|
| committer | Hyunho Kang <hhstark.kang@samsung.com> | 2016-12-12 17:26:22 +0900 |
| commit | 75d01da0f5afc0849057c7fab0b28b13a931ac84 (patch) | |
| tree | 76520869be5dafa5065b0080dd1c58ad9a22b56c | |
| parent | 0e8809fe71f40df68041f64322e7a449563652c8 (diff) | |
| download | appcore-watch-tizen_3.0.m2.tar.gz appcore-watch-tizen_3.0.m2.tar.bz2 appcore-watch-tizen_3.0.m2.zip | |
Replace tbm to screen-connectorsubmit/tizen_3.0/20161220.014437submit/tizen_3.0/20161220.012114submit/tizen_3.0/20161219.021901submit/tizen_3.0.m2/20170104.093749accepted/tizen/3.0/wearable/20161221.005957accepted/tizen/3.0/tv/20161221.005908accepted/tizen/3.0/mobile/20161221.010231accepted/tizen/3.0/ivi/20161221.010046accepted/tizen/3.0/common/20161221.181008accepted/tizen/3.0.m2/wearable/20170104.122756accepted/tizen/3.0.m2/tv/20170104.122409accepted/tizen/3.0.m2/mobile/20170104.122120tizen_3.0_tvtizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: I52b50df30b4a6e3cdc8122c7a517d878e34bab81
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | packaging/appcore-watch.spec | 1 | ||||
| -rwxr-xr-x | src/appcore-watch.c | 6 | ||||
| -rwxr-xr-x | src/watch_app_main.c | 7 |
4 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15028d3..cc2118b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ pkg_check_modules(pkg_watch REQUIRED icu-i18n glib-2.0 gio-2.0 + screen_connector_provider ) FOREACH(flag ${pkg_watch_CFLAGS}) SET(EXTRA_CFLAGS_watch "${EXTRA_CFLAGS_watch} ${flag}") diff --git a/packaging/appcore-watch.spec b/packaging/appcore-watch.spec index 5e69f1a..94140e7 100644 --- a/packaging/appcore-watch.spec +++ b/packaging/appcore-watch.spec @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(ecore-wayland) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(screen_connector_provider) BuildRequires: cmake diff --git a/src/appcore-watch.c b/src/appcore-watch.c index fd90d4c..cc93811 100755 --- a/src/appcore-watch.c +++ b/src/appcore-watch.c @@ -35,7 +35,7 @@ #include <glib-object.h> #include <Ecore_Wayland.h> #include <widget_app.h> -#include <aul_rsm_provider.h> +#include <screen_connector_provider.h> #include "appcore-watch.h" #include "appcore-watch-log.h" @@ -1185,7 +1185,7 @@ static int __before_loop(struct watch_priv *watch, int argc, char **argv) r = watch_core_init(watch->name, &w_ops, argc, argv); _retv_if(r < 0, -1); - aul_rsm_provider_init(); + screen_connector_provider_init(); __widget_create(NULL, NULL, width, height, NULL); @@ -1207,7 +1207,7 @@ static void __after_loop(struct watch_priv *watch) if (watch->ops && watch->ops->terminate) watch->ops->terminate(watch->ops->data); - aul_rsm_provider_fini(); + screen_connector_provider_fini(); elm_shutdown(); diff --git a/src/watch_app_main.c b/src/watch_app_main.c index 3763c9f..ab94fca 100755 --- a/src/watch_app_main.c +++ b/src/watch_app_main.c @@ -25,7 +25,7 @@ #include <Evas.h> #include <Elementary.h> #include <Ecore_Wayland.h> -#include <aul_rsm_provider.h> +#include <screen_connector_provider.h> #include "appcore-watch.h" #include "appcore-watch-log.h" @@ -701,8 +701,7 @@ EXPORT_API int watch_app_get_elm_win(Evas_Object **win) _E("failed to get surface"); surface = ecore_wl_window_surface_get(wl_win); - - aul_rsm_provider_remote_enable(watch_core_get_appid(), surface); + screen_connector_provider_remote_enable(watch_core_get_appid(), surface); *win = ret_win; return APP_ERROR_NONE; @@ -734,4 +733,4 @@ EXPORT_API int watch_app_get_time_tick_frequency(int *ticks, watch_app_time_tick if (type == NULL || ticks == NULL) return APP_ERROR_INVALID_PARAMETER; return watch_core_get_time_tick_frequency(ticks, type); -}
\ No newline at end of file +} |