From 8fb7a0e4e5014c9011c42fbbe1ae306eedea5e82 Mon Sep 17 00:00:00 2001 From: MyoungJune Park Date: Mon, 26 Nov 2012 15:25:39 +0900 Subject: [PATCH] removed heynoti dep --- packaging/org.tizen.setting.spec | 2 -- setting-memory/CMakeLists.txt | 2 +- setting-memory/include/setting-memory.h | 1 - setting-phone/CMakeLists.txt | 2 +- setting-phone/include/setting-phone.h | 1 - setting-phone/src/setting-phone.c | 3 ++- setting-reset/CMakeLists.txt | 2 +- setting-reset/src/setting-reset-settings.c | 1 - setting-time/CMakeLists.txt | 2 +- setting-time/include/setting-time-main.h | 3 --- setting-time/include/setting-time.h | 3 --- setting-time/src/setting-time-engine.c | 1 - setting-time/src/setting-time-main.c | 3 +-- src/CMakeLists.txt | 2 +- src/setting.c | 1 - 15 files changed, 8 insertions(+), 21 deletions(-) diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec index 03abcdb..ad3d21b 100755 --- a/packaging/org.tizen.setting.spec +++ b/packaging/org.tizen.setting.spec @@ -16,7 +16,6 @@ BuildRequires: pkgconfig(haptic) BuildRequires: pkgconfig(bluetooth-api) BuildRequires: pkgconfig(mm-sound) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(heynoti) BuildRequires: pkgconfig(ui-gadget-1) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libxml-2.0) @@ -406,7 +405,6 @@ fi /usr/apps/org.tizen.setting/bin/setting_conf_util timezone_init chown 5000:5000 /opt/data/setting -R #------------------------------------------ -heynotitool set setting_time_changed -a sync mkdir -p /usr/ug/bin/ diff --git a/setting-memory/CMakeLists.txt b/setting-memory/CMakeLists.txt index 89714d5..ca32e35 100755 --- a/setting-memory/CMakeLists.txt +++ b/setting-memory/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_memory REQUIRED elementary appcore-common appcore-efl ui-gadget-1 capi-appfw-application tapi devman heynoti sysman) +pkg_check_modules(pkgs_memory REQUIRED elementary appcore-common appcore-efl ui-gadget-1 capi-appfw-application tapi devman sysman) FOREACH(flag ${pkgs_memory_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/setting-memory/include/setting-memory.h b/setting-memory/include/setting-memory.h index e483df6..fd1eabd 100755 --- a/setting-memory/include/setting-memory.h +++ b/setting-memory/include/setting-memory.h @@ -26,7 +26,6 @@ #include -#include #include #include diff --git a/setting-phone/CMakeLists.txt b/setting-phone/CMakeLists.txt index 91caea3..9832b37 100755 --- a/setting-phone/CMakeLists.txt +++ b/setting-phone/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_phone REQUIRED evas eina ecore elementary appcore-common appcore-efl haptic heynoti tapi ui-gadget-1 capi-appfw-application appsvc libxml-2.0) +pkg_check_modules(pkgs_phone REQUIRED evas eina ecore elementary appcore-common appcore-efl haptic tapi ui-gadget-1 capi-appfw-application appsvc libxml-2.0) FOREACH(flag ${pkgs_phone_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/setting-phone/include/setting-phone.h b/setting-phone/include/setting-phone.h index b10e0b6..bb52ad1 100755 --- a/setting-phone/include/setting-phone.h +++ b/setting-phone/include/setting-phone.h @@ -23,7 +23,6 @@ #include #include -#include #include diff --git a/setting-phone/src/setting-phone.c b/setting-phone/src/setting-phone.c index 1595259..0eebb32 100755 --- a/setting-phone/src/setting-phone.c +++ b/setting-phone/src/setting-phone.c @@ -665,6 +665,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv) { SETTING_TRACE("Begin to reset language & region..."); //a. notify system language changed + #if 0 char lang_changed_sys_noti_name[SYS_NOTI_NAME_LEN]; int res = -1; res = heynoti_get_snoti_name("LANG_CHANGED", @@ -674,7 +675,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv) heynoti_publish(lang_changed_sys_noti_name); } ret += res; - + #endif //b .reset default localeid int err = -1; uloc_setDefault("en_US", &err); diff --git a/setting-reset/CMakeLists.txt b/setting-reset/CMakeLists.txt index a91c69e..58b433e 100644 --- a/setting-reset/CMakeLists.txt +++ b/setting-reset/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_reset REQUIRED evas ecore elementary appcore-common appcore-efl tapi json-glib-1.0 ui-gadget-1 capi-appfw-application mm-sound dlog heynoti ) +pkg_check_modules(pkgs_reset REQUIRED evas ecore elementary appcore-common appcore-efl tapi json-glib-1.0 ui-gadget-1 capi-appfw-application mm-sound dlog) FOREACH(flag ${pkgs_reset_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c index 49bdd8a..6ee6d73 100755 --- a/setting-reset/src/setting-reset-settings.c +++ b/setting-reset/src/setting-reset-settings.c @@ -20,7 +20,6 @@ */ #include #include -#include #include #include diff --git a/setting-time/CMakeLists.txt b/setting-time/CMakeLists.txt index 258d14b..08fe9d5 100755 --- a/setting-time/CMakeLists.txt +++ b/setting-time/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_time REQUIRED evas elementary appcore-common appcore-efl ecore tapi heynoti ui-gadget-1 capi-appfw-application sysman pmapi icu-i18n icu-io icu-le icu-lx icu-uc) +pkg_check_modules(pkgs_time REQUIRED evas elementary appcore-common appcore-efl ecore tapi ui-gadget-1 capi-appfw-application sysman pmapi icu-i18n icu-io icu-le icu-lx icu-uc) FOREACH(flag ${pkgs_time_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/setting-time/include/setting-time-main.h b/setting-time/include/setting-time-main.h index 9dc665f..9880767 100755 --- a/setting-time/include/setting-time-main.h +++ b/setting-time/include/setting-time-main.h @@ -30,9 +30,6 @@ #define __MAX_PATH_SIZE 1024 -/* TODO once time changes, heynoti message is sent. - need to see this is proper design */ - #define SETTING_TIME_ZONEINFO_PATH "/usr/share/zoneinfo/" #define SETTING_TIME_SHARE_LOCAL_PATH "/usr/share/locale" #define SETTING_TZONE_SYMLINK_PATH "/opt/etc/localtime" diff --git a/setting-time/include/setting-time.h b/setting-time/include/setting-time.h index 5597955..8785efd 100755 --- a/setting-time/include/setting-time.h +++ b/setting-time/include/setting-time.h @@ -31,8 +31,6 @@ #include -#include - #include #include #define ERR_BIGGER_THAN_2037 "Cannot Set the year bigger than 2037" @@ -66,7 +64,6 @@ struct _SettingTimeUG { char *caller; Ecore_Timer *update_timer; - Ecore_Timer *heynoti_timer; Evas_Object *pop_progress; Evas_Object *pop; Eina_Bool is_datefield_selected; diff --git a/setting-time/src/setting-time-engine.c b/setting-time/src/setting-time-engine.c index 1cdfdd2..4f26a4e 100755 --- a/setting-time/src/setting-time-engine.c +++ b/setting-time/src/setting-time-engine.c @@ -20,7 +20,6 @@ */ #include -/* To set system time takes some time. It makes some time before firing heynoti of setting_time_changed.*/ int setting_time_update_cb(void *data) { retv_if(data == NULL, -1); diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c index ce56cd7..92caaae 100755 --- a/setting-time/src/setting-time-main.c +++ b/setting-time/src/setting-time-main.c @@ -971,7 +971,6 @@ setting_time_main_launch_worldclock_result_ug_cb(ui_gadget_h ug, // update the display for timezone setting_update_timezone(ad); - //heynoti_publish(SETTING_TIME_CHANGED); static int t_event_val = -1; vconf_set_int (VCONFKEY_SYSTEM_TIME_CHANGED, t_event_val); SETTING_TRACE_END; @@ -1239,7 +1238,7 @@ static void __time_auto_update(void *data) elm_datetime_value_set(ad->data_time->eo_check, &ts_ret); } - // c.heynoti_publish + // event notification static int t_event_val = -1; vconf_set_int (VCONFKEY_SYSTEM_TIME_CHANGED, t_event_val); } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71a79af..44153c1 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ pkg_check_modules(pkgs_main REQUIRED glib-2.0 gthread-2.0 elementary appcore-common appcore-efl tapi - utilX heynoti + utilX dlog json-glib-1.0 ui-gadget-1 capi-appfw-application aul diff --git a/src/setting.c b/src/setting.c index c702afb..d867f6b 100755 --- a/src/setting.c +++ b/src/setting.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include -- 2.7.4