From 18fca826efbd9e14e4dab817b5811a96b0a2134d Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Tue, 4 Sep 2018 14:53:15 +0900 Subject: [PATCH] Change the package name Change-Id: Icd1f4a349160ca3953e41d714be9659ac43c1088 Signed-off-by: hyunuktak --- CMakeLists.txt | 7 +- include/net-popup-strings.h | 80 +++++++++++----------- include/net-popup-w.h | 11 +-- include/net-popup.h | 3 +- ...tpopup.manifest => org.tizen.net-popup.manifest | 0 ...{net.netpopup.spec => org.tizen.net-popup.spec} | 20 +++--- .../{net.netpopup.xml => org.tizen.net-popup.xml} | 4 +- src/net-popup.c | 37 +++++----- 8 files changed, 85 insertions(+), 77 deletions(-) rename net.netpopup.manifest => org.tizen.net-popup.manifest (100%) rename packaging/{net.netpopup.spec => org.tizen.net-popup.spec} (75%) rename resources/{net.netpopup.xml => org.tizen.net-popup.xml} (69%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c5dd9e..c8f1ffa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ SET(SRCS SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(LOCALEDIR "${PREFIX}/share/locale") SET(IMAGE_DIR "${PREFIX}/res/images") +SET(PKG_NAME "org.tizen.net-popup") IF("${CMAKE_BUILD_TYPE}" STREQUAL "") SET(CMAKE_BUILD_TYPE "Release") @@ -71,12 +72,12 @@ ADD_CUSTOM_TARGET(netpopup-custom.edj ADD_DEPENDENCIES(${PROJECT_NAME} netpopup-custom.edj) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_APP}/${PKG_NAME}/bin) # install desktop file & icon SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edj DESTINATION /usr/ug/res/edje/net-popup/) -INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/net.netpopup.xml DESTINATION ${PREFIX}/share/packages/) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/netpopup-custom.edj DESTINATION ${TZ_SYS_RO_APP}/${PKG_NAME}/res/edje) +INSTALL(FILES ${CMAKE_BINARY_DIR}/resources/${PKG_NAME}.xml DESTINATION ${PREFIX}/share/packages/) INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/resources/ DESTINATION ${IMAGE_DIR} FILES_MATCHING PATTERN "*.png") ADD_SUBDIRECTORY(po) diff --git a/include/net-popup-strings.h b/include/net-popup-strings.h index 5207446..fafce58 100755 --- a/include/net-popup-strings.h +++ b/include/net-popup-strings.h @@ -24,45 +24,45 @@ #include "net-popup.h" -#define ALERT_STR_MOBILE_NETWORKS_CHARGE dgettext(PACKAGE, "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES") -#define ALERT_STR_ERR_UNAVAILABLE dgettext(PACKAGE, "IDS_IM_POP_SERVICE_NOT_AVAIL") -#define ALERT_STR_ERR_CONNECT dgettext(PACKAGE, "IDS_WIFI_POP_UNABLE_TO_CONNECT") -#define ALERT_STR_ERR_WRONG_PASSWORD dgettext(PACKAGE, "IDS_ST_POP_WRONG_PASSWORD") -#define ALERT_STR_ERR_NOT_SUPPORT dgettext(PACKAGE, "IDS_ST_POP_NOT_SUPPORTED") -#define ALERT_STR_WIFI_CONNECTED dgettext(PACKAGE, _("IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS")) -#define ALERT_STR_RESTRICTED_USE_WIFI dgettext(PACKAGE, "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI") -#define ALERT_STR_NO_AP_FOUND dgettext(PACKAGE, "IDS_WIFI_POP_NO_WI_FI_AP_FOUND") -#define ALERT_STR_WIFI_MOBILE_AP_ON dgettext(PACKAGE, "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING") -#define ALERT_STR_LENGHTY_PASSWORD dgettext(PACKAGE, "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED") -#define ALERT_STR_DONT_ASK_AGAIN dgettext(PACKAGE, "IDS_WIFI_BUTTON_DONT_ASK_AGAIN") -#define ALERT_STR_OK dgettext(PACKAGE, "IDS_COM_SK_OK") -#define ALERT_STR_NO dgettext(PACKAGE, "IDS_COM_SK_NO") -#define ALERT_STR_CANCEL dgettext(PACKAGE, "IDS_COM_SK_CANCEL") -#define ALERT_STR_WIFI dgettext(PACKAGE, "IDS_WIFI_BODY_WI_FI") -#define ALERT_STR_SECURITY_RESTRICTION dgettext(PACKAGE, _("IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS")) -#define ALERT_STR_WIFI_TETHERING dgettext(PACKAGE, "IDS_MOBILEAP_MBODY_WI_FI_TETHERING") -#define ALERT_STR_BT_TETHERING dgettext(PACKAGE, "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING") -#define ALERT_STR_USB_TETHERING dgettext(PACKAGE, "IDS_MOBILEAP_MBODY_USB_TETHERING") -#define ALERT_STR_DATA_USAGE_WARNING dgettext(PACKAGE, "IDS_COM_BODY_DATA_USAGE_WARNING") -#define ALERT_STR_DATA_USAGE_TITLE dgettext(PACKAGE, "IDS_SM_HEADER_MOBILE_DATA_TURNED_OFF_ABB2") -#define ALERT_STR_DATA_USAGE_CONTENT dgettext(PACKAGE, _("IDS_SM_POP_THE_MAXIMUM_DATA_USAGE_LIMIT_HPS_HAS_BEEN_REACHED_MOBILE_DATA_HAS_BEEN_TURNED_OFF_TURNING_ON_MOBILE_DATA_MAY_RESULT_IN_ADDITIONAL_CHARGES_MSG")) -#define ALERT_STR_DATA_USAGE_TURN_ON_BUTTON dgettext(PACKAGE, "IDS_SM_BUTTON_TURN_ON_ABB3") -#define ALERT_STR_VPN_CONNECT_TITLE dgettext(PACKAGE, "IDS_ST_HEADER_CONNECT_TO_VPN") -#define ALERT_STR_VPN_DISCONNECT_TITLE dgettext(PACKAGE, "IDS_ST_HEADER_DISCONNECT_FROM_VPN") -#define ALERT_STR_VPN_CONNECT_CONTENT dgettext(PACKAGE, "IDS_ST_POP_YOUR_DEVICE_WILL_BE_CONNECTED_TO_THE_VIRTUAL_PRIVATE_NETWORK_HVPN_SERVICE") -#define ALERT_STR_VPN_DISCONNECT_CONTENT dgettext(PACKAGE, "IDS_ST_POP_YOUR_DEVICE_WILL_BE_DISCONNECTED_FROM_THE_VIRTUAL_PRIVATE_NETWORK_HVPN_SERVICE") -#define ALERT_STR_VPN_CONNECT_BUTTON dgettext(PACKAGE, "IDS_ST_BUTTON_CONNECT_ABB6") -#define ALERT_STR_VPN_DISCONNECT_BUTTON dgettext(PACKAGE, "IDS_ST_BUTTON_DISCONNECT_ABB5") -#define ALERT_STR_NO_NETWORK_CONNECTION dgettext(PACKAGE, "IDS_MSG_HEADER_NO_NETWORK_CONNECTION") -#define ALERT_STR_CONNECT_TO_MOBILE_NETWORK dgettext(PACKAGE, "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK") -#define ALERT_STR_CANT_CONNECT_TO_MOBILE dgettext(PACKAGE, "IDS_IDLE_POP_CANT_CONNECT_TO_MOBILE_NETWORKS_WHILE_FLIGHT_MODE_IS_TURNED_ON_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_OFF_FLIGHT_MODE_AND_TRY_AGAIN") -#define ALERT_STR_MOBILE_DATA_IS_TURNED_OFF dgettext(PACKAGE, "IDS_IDLE_POP_MOBILE_DATA_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_MSG") -#define ALERT_STR_NO_MOBILE_NETWORKS dgettext(PACKAGE, "IDS_BR_BODY_NO_MOBILE_NETWORKS_HAVE_BEEN_FOUND") -#define ALERT_STR_ROAMING dgettext(PACKAGE, "IDS_IDLE_POP_DATA_ROAMING_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_ON_DATA_ROAMING_AND_TRY_AGAIN") -#define ALERT_STR_ROAMING_WITH_PAYMENT dgettext(PACKAGE, "IDS_IDLE_POP_DATA_ROAMING_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_ON_DATA_ROAMING_AND_TRY_AGAIN_MSG") -#define ALERT_STR_TURN_ON_DATA_ROAMING dgettext(PACKAGE, "IDS_IDLE_OPT_TURN_ON_DATA_ROAMING_ABB") -#define ALERT_STR_DO_NOT_SHOW_AGAIN dgettext(PACKAGE, "IDS_BR_OPT_DO_NOT_SHOW_AGAIN") -#define ALERT_STR_SETTINGS dgettext(PACKAGE, "IDS_ST_BODY_SETTINGS") -#define ALERT_STR_RETRY dgettext(PACKAGE, "IDS_COM_SK_RETRY_A") +#define ALERT_STR_MOBILE_NETWORKS_CHARGE dgettext(DOMAIN_NAME, "IDS_QP_POP_YOU_WILL_BE_CONNECTED_TO_YOUR_MOBILE_NETWORK_THIS_MAY_RESULT_IN_ADDITIONAL_CHARGES") +#define ALERT_STR_ERR_UNAVAILABLE dgettext(DOMAIN_NAME, "IDS_IM_POP_SERVICE_NOT_AVAIL") +#define ALERT_STR_ERR_CONNECT dgettext(DOMAIN_NAME, "IDS_WIFI_POP_UNABLE_TO_CONNECT") +#define ALERT_STR_ERR_WRONG_PASSWORD dgettext(DOMAIN_NAME, "IDS_ST_POP_WRONG_PASSWORD") +#define ALERT_STR_ERR_NOT_SUPPORT dgettext(DOMAIN_NAME, "IDS_ST_POP_NOT_SUPPORTED") +#define ALERT_STR_WIFI_CONNECTED dgettext(DOMAIN_NAME, _("IDS_ST_BODY_CONNECTED_TO_WI_FI_NETWORK_PS")) +#define ALERT_STR_RESTRICTED_USE_WIFI dgettext(DOMAIN_NAME, "IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI") +#define ALERT_STR_NO_AP_FOUND dgettext(DOMAIN_NAME, "IDS_WIFI_POP_NO_WI_FI_AP_FOUND") +#define ALERT_STR_WIFI_MOBILE_AP_ON dgettext(DOMAIN_NAME, "IDS_ST_POP_TURNING_ON_WI_FI_WILL_DISABLE_WI_FI_TETHERING") +#define ALERT_STR_LENGHTY_PASSWORD dgettext(DOMAIN_NAME, "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED") +#define ALERT_STR_DONT_ASK_AGAIN dgettext(DOMAIN_NAME, "IDS_WIFI_BUTTON_DONT_ASK_AGAIN") +#define ALERT_STR_OK dgettext(DOMAIN_NAME, "IDS_COM_SK_OK") +#define ALERT_STR_NO dgettext(DOMAIN_NAME, "IDS_COM_SK_NO") +#define ALERT_STR_CANCEL dgettext(DOMAIN_NAME, "IDS_COM_SK_CANCEL") +#define ALERT_STR_WIFI dgettext(DOMAIN_NAME, "IDS_WIFI_BODY_WI_FI") +#define ALERT_STR_SECURITY_RESTRICTION dgettext(DOMAIN_NAME, _("IDS_COM_BODY_SECURITY_POLICY_RESTRICTS_USE_OF_PS")) +#define ALERT_STR_WIFI_TETHERING dgettext(DOMAIN_NAME, "IDS_MOBILEAP_MBODY_WI_FI_TETHERING") +#define ALERT_STR_BT_TETHERING dgettext(DOMAIN_NAME, "IDS_MOBILEAP_BODY_BLUETOOTH_TETHERING") +#define ALERT_STR_USB_TETHERING dgettext(DOMAIN_NAME, "IDS_MOBILEAP_MBODY_USB_TETHERING") +#define ALERT_STR_DATA_USAGE_WARNING dgettext(DOMAIN_NAME, "IDS_COM_BODY_DATA_USAGE_WARNING") +#define ALERT_STR_DATA_USAGE_TITLE dgettext(DOMAIN_NAME, "IDS_SM_HEADER_MOBILE_DATA_TURNED_OFF_ABB2") +#define ALERT_STR_DATA_USAGE_CONTENT dgettext(DOMAIN_NAME, _("IDS_SM_POP_THE_MAXIMUM_DATA_USAGE_LIMIT_HPS_HAS_BEEN_REACHED_MOBILE_DATA_HAS_BEEN_TURNED_OFF_TURNING_ON_MOBILE_DATA_MAY_RESULT_IN_ADDITIONAL_CHARGES_MSG")) +#define ALERT_STR_DATA_USAGE_TURN_ON_BUTTON dgettext(DOMAIN_NAME, "IDS_SM_BUTTON_TURN_ON_ABB3") +#define ALERT_STR_VPN_CONNECT_TITLE dgettext(DOMAIN_NAME, "IDS_ST_HEADER_CONNECT_TO_VPN") +#define ALERT_STR_VPN_DISCONNECT_TITLE dgettext(DOMAIN_NAME, "IDS_ST_HEADER_DISCONNECT_FROM_VPN") +#define ALERT_STR_VPN_CONNECT_CONTENT dgettext(DOMAIN_NAME, "IDS_ST_POP_YOUR_DEVICE_WILL_BE_CONNECTED_TO_THE_VIRTUAL_PRIVATE_NETWORK_HVPN_SERVICE") +#define ALERT_STR_VPN_DISCONNECT_CONTENT dgettext(DOMAIN_NAME, "IDS_ST_POP_YOUR_DEVICE_WILL_BE_DISCONNECTED_FROM_THE_VIRTUAL_PRIVATE_NETWORK_HVPN_SERVICE") +#define ALERT_STR_VPN_CONNECT_BUTTON dgettext(DOMAIN_NAME, "IDS_ST_BUTTON_CONNECT_ABB6") +#define ALERT_STR_VPN_DISCONNECT_BUTTON dgettext(DOMAIN_NAME, "IDS_ST_BUTTON_DISCONNECT_ABB5") +#define ALERT_STR_NO_NETWORK_CONNECTION dgettext(DOMAIN_NAME, "IDS_MSG_HEADER_NO_NETWORK_CONNECTION") +#define ALERT_STR_CONNECT_TO_MOBILE_NETWORK dgettext(DOMAIN_NAME, "IDS_BR_MBODY_CONNECT_TO_MOBILE_NETWORK") +#define ALERT_STR_CANT_CONNECT_TO_MOBILE dgettext(DOMAIN_NAME, "IDS_IDLE_POP_CANT_CONNECT_TO_MOBILE_NETWORKS_WHILE_FLIGHT_MODE_IS_TURNED_ON_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_OFF_FLIGHT_MODE_AND_TRY_AGAIN") +#define ALERT_STR_MOBILE_DATA_IS_TURNED_OFF dgettext(DOMAIN_NAME, "IDS_IDLE_POP_MOBILE_DATA_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_MSG") +#define ALERT_STR_NO_MOBILE_NETWORKS dgettext(DOMAIN_NAME, "IDS_BR_BODY_NO_MOBILE_NETWORKS_HAVE_BEEN_FOUND") +#define ALERT_STR_ROAMING dgettext(DOMAIN_NAME, "IDS_IDLE_POP_DATA_ROAMING_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_ON_DATA_ROAMING_AND_TRY_AGAIN") +#define ALERT_STR_ROAMING_WITH_PAYMENT dgettext(DOMAIN_NAME, "IDS_IDLE_POP_DATA_ROAMING_IS_TURNED_OFF_CONNECT_TO_A_WI_FI_NETWORK_INSTEAD_OR_TURN_ON_DATA_ROAMING_AND_TRY_AGAIN_MSG") +#define ALERT_STR_TURN_ON_DATA_ROAMING dgettext(DOMAIN_NAME, "IDS_IDLE_OPT_TURN_ON_DATA_ROAMING_ABB") +#define ALERT_STR_DO_NOT_SHOW_AGAIN dgettext(DOMAIN_NAME, "IDS_BR_OPT_DO_NOT_SHOW_AGAIN") +#define ALERT_STR_SETTINGS dgettext(DOMAIN_NAME, "IDS_ST_BODY_SETTINGS") +#define ALERT_STR_RETRY dgettext(DOMAIN_NAME, "IDS_COM_SK_RETRY_A") #endif /* __DEF_NET_POPUP_STRINGS_H__ */ diff --git a/include/net-popup-w.h b/include/net-popup-w.h index 88e2eaf..33f0b18 100755 --- a/include/net-popup-w.h +++ b/include/net-popup-w.h @@ -26,10 +26,11 @@ #include #include -#define PACKAGE "net-popup" +#define PACKAGE "org.tizen.net-popup" #define NET_POPUP_W "NET_POPUP_W" #define LOCALEDIR "/usr/share/locale" #define WEARABLE_DATAUSAGE_APPID "org.tizen.watch-setting" +#define DOMAIN_NAME "net-popup" #define log_print(MID, format, args...) \ SLOG(LOG_INFO, MID, "\033[0m[%s:%d]\033[0m " format, __func__, __LINE__, ##args) @@ -37,11 +38,11 @@ #define FUNCTION_ENTER log_print(NET_POPUP_W, "enter") #define FUNCTION_QUIT log_print(NET_POPUP_W, "quit") -#define DATA_USAGE_WARN_TITLE dgettext(PACKAGE, "WDS_ST_HEADER_NEAR_DATA_LIMIT_ABB") -#define DATA_USAGE_RSTN_TITLE dgettext(PACKAGE, "WDS_ST_PHEADER_DATA_LIMIT_REACHED") +#define DATA_USAGE_WARN_TITLE dgettext(DOMAIN_NAME, "WDS_ST_HEADER_NEAR_DATA_LIMIT_ABB") +#define DATA_USAGE_RSTN_TITLE dgettext(DOMAIN_NAME, "WDS_ST_PHEADER_DATA_LIMIT_REACHED") -#define DATA_USAGE_WARN_BODY dgettext(PACKAGE, "WDS_ST_POP_CHECK_YOUR_DATA_LIMIT_IN_SETTINGS_Q") -#define DATA_USAGE_RSTN_BODY dgettext(PACKAGE, "WDS_ST_POP_CHECK_YOUR_DATA_LIMIT_IN_SETTINGS_Q") +#define DATA_USAGE_WARN_BODY dgettext(DOMAIN_NAME, "WDS_ST_POP_CHECK_YOUR_DATA_LIMIT_IN_SETTINGS_Q") +#define DATA_USAGE_RSTN_BODY dgettext(DOMAIN_NAME, "WDS_ST_POP_CHECK_YOUR_DATA_LIMIT_IN_SETTINGS_Q") typedef enum { POPUP_TYPE_RSTN, diff --git a/include/net-popup.h b/include/net-popup.h index 2ea0a12..69bd5f8 100755 --- a/include/net-popup.h +++ b/include/net-popup.h @@ -23,7 +23,8 @@ #include #include -#define PACKAGE "net-popup" +#define PACKAGE "org.tizen.net-popup" +#define DOMAIN_NAME "net-popup" #define ALERT_STR_LEN_MAX 1024 #define NET_POPUP "NET_POPUP" diff --git a/net.netpopup.manifest b/org.tizen.net-popup.manifest similarity index 100% rename from net.netpopup.manifest rename to org.tizen.net-popup.manifest diff --git a/packaging/net.netpopup.spec b/packaging/org.tizen.net-popup.spec similarity index 75% rename from packaging/net.netpopup.spec rename to packaging/org.tizen.net-popup.spec index 1bd0595..dde4005 100644 --- a/packaging/net.netpopup.spec +++ b/packaging/org.tizen.net-popup.spec @@ -1,7 +1,7 @@ -Name: net.netpopup +Name: org.tizen.net-popup Summary: Network Notification Popup application -Version: 0.2.91 -Release: 2 +Version: 0.2.93 +Release: 1 Group: App/Network License: Flora-1.1 Source0: %{name}-%{version}.tar.gz @@ -35,9 +35,11 @@ Network Notification Popup application %prep %setup -q +%define PKGNAME org.tizen.net-popup %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DTZ_SYS_RO_APP=%{TZ_SYS_RO_APP} make %{?_smp_mflags} @@ -46,10 +48,10 @@ make %{?_smp_mflags} %make_install %files -%manifest net.netpopup.manifest -%{_bindir}/net-popup -%{_datadir}/packages/net.netpopup.xml -/usr/ug/res/edje/net-popup/*.edj +%manifest %{PKGNAME}.manifest +/usr/apps/%{PKGNAME}/bin/net-popup +/usr/apps/%{PKGNAME}/res/edje/*.edj +%{_datadir}/packages/org.tizen.net-popup.xml +%{_datadir}/locale/*/LC_MESSAGES/*.mo /usr/res/images/*.png -%{_datadir}/locale/*/LC_MESSAGES/net-popup.mo %license LICENSE diff --git a/resources/net.netpopup.xml b/resources/org.tizen.net-popup.xml similarity index 69% rename from resources/net.netpopup.xml rename to resources/org.tizen.net-popup.xml index 7dc299b..3ba765f 100755 --- a/resources/net.netpopup.xml +++ b/resources/org.tizen.net-popup.xml @@ -1,8 +1,8 @@ - + Network popup - + diff --git a/src/net-popup.c b/src/net-popup.c index 56c5cec..08d9b93 100755 --- a/src/net-popup.c +++ b/src/net-popup.c @@ -46,12 +46,15 @@ #include "net-popup-vpn.h" #include "net-popup-strings.h" +#define NET_POPUP_APPID "org.tizen.net-popup" #define NET_WIFIQS_APPID "net.wifi-qs" #define DATA_USAGE_APPID "org.tizen.setting" -#define WIFI_EFL_UG "wifi-efl-ug" +#define WIFI_EFL_UG "wifi-efl-ug" #define LOCALEDIR "/usr/share/locale" -#define NETPOPUP_EDJ tzplatform_mkpath(TZ_SYS_RO_UG, "/res/edje/net-popup/netpopup-custom.edj") +#define NETPOPUP_EDJ "/usr/apps/" \ + NET_POPUP_APPID \ + "/res/edje/netpopup-custom.edj" #define QP_PRELOAD_NOTI_ICON_PATH tzplatform_mkpath(TZ_SYS_RO_APP, "/org.tizen.quickpanel/shared/res/noti_icons/Wi-Fi") #define STC_NOTI_DATA_USAGE_ICON_PATH "/usr/share/icons/" @@ -68,25 +71,25 @@ #define NETCONFIG_NOTIFICATION_WIFI_IN_RANGE_ICON_LITE \ tzplatform_mkpath(TZ_SYS_RO_ICONS, "/noti_wifi_in_range.png") #define NETCONFIG_NOTIFICATION_WIFI_FOUND_TITLE \ - dgettext(PACKAGE, "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE") + dgettext(DOMAIN_NAME, "IDS_COM_BODY_WI_FI_NETWORKS_AVAILABLE") #define NETCONFIG_NOTIFICATION_WIFI_FOUND_CONTENT \ - dgettext(PACKAGE, "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT") + dgettext(DOMAIN_NAME, "IDS_WIFI_SBODY_TAP_HERE_TO_CONNECT") #define NETCONFIG_NOTIFICATION_WIFI_PORTAL_TITLE \ - dgettext(PACKAGE, "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB") + dgettext(DOMAIN_NAME, "IDS_WIFI_HEADER_SIGN_IN_TO_WI_FI_NETWORK_ABB") #define NETCONFIG_NOTIFICATION_IP_CONFLICT_TITLE \ - dgettext(PACKAGE, "IDS_IP_CONFLICT") + dgettext(DOMAIN_NAME, "IDS_IP_CONFLICT") #define NETCONFIG_NOTIFICATION_WIFI_PORTAL_CONTENT "\"%s\"" #define STC_NOTIFICATION_WARNING_TITLE \ - dgettext(PACKAGE, "IDS_COM_BODY_DATA_USAGE_WARNING") + dgettext(DOMAIN_NAME, "IDS_COM_BODY_DATA_USAGE_WARNING") #define STC_NOTIFICATION_WARNING_CONTENT \ - dgettext(PACKAGE, "IDS_SM_SBODY_TAP_HERE_TO_VIEW_YOUR_DATA_USAGE_ABB") + dgettext(DOMAIN_NAME, "IDS_SM_SBODY_TAP_HERE_TO_VIEW_YOUR_DATA_USAGE_ABB") #define STC_NOTIFICATION_RESTRICTION_OK_TITLE \ - dgettext(PACKAGE, "IDS_SM_HEADER_MOBILE_DATA_TURNED_OFF_ABB2") + dgettext(DOMAIN_NAME, "IDS_SM_HEADER_MOBILE_DATA_TURNED_OFF_ABB2") #define STC_NOTIFICATION_RESTRICTION_OK_CONTENT \ - dgettext(PACKAGE, "IDS_SM_SBODY_TAP_HERE_TO_TURN_IT_ON_AGAIN_ABB") + dgettext(DOMAIN_NAME, "IDS_SM_SBODY_TAP_HERE_TO_TURN_IT_ON_AGAIN_ABB") #define STC_NOTIFICATION_RESTRICTION_ON_TITLE \ - dgettext(PACKAGE, "IDS_SM_TMBODY_MOBILE_DATA_LIMIT_EXCEEDED_ABB") + dgettext(DOMAIN_NAME, "IDS_SM_TMBODY_MOBILE_DATA_LIMIT_EXCEEDED_ABB") #define STC_TOTAL_DATACALL "TOTAL_DATACALL" #define STC_TOTAL_WIFI "TOTAL_WIFI" @@ -190,9 +193,9 @@ GDBusProxy *__net_popup_init_dbus(void) } proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, NULL, - "net.netpopup", + NET_POPUP_APPID, "/Netpopup", - "net.netpopup", + NET_POPUP_APPID, NULL, &err); if (proxy == NULL) { @@ -281,7 +284,7 @@ static bool __net_popup_create(void *data) { log_print(NET_POPUP, "__net_popup_create()\n"); - bindtextdomain(PACKAGE, LOCALEDIR); + bindtextdomain(DOMAIN_NAME, LOCALEDIR); return true; } @@ -1742,7 +1745,7 @@ static void __net_popup_add_found_ap_noti(void) notification_error_e noti_err = NOTIFICATION_ERROR_NONE; app_control_h service_handle = NULL; - notification_get_detail_list("net.netpopup", NOTIFICATION_GROUP_ID_NONE, + notification_get_detail_list(NET_POPUP_APPID, NOTIFICATION_GROUP_ID_NONE, NOTIFICATION_PRIV_ID_NONE, -1, ¬i_list); if (noti_list != NULL) { notification_free_list(noti_list); @@ -1883,7 +1886,7 @@ static void __net_popup_add_ip_conflict_noti(app_control_h request) log_print(NET_POPUP, "Successfully added notification"); - notification_get_detail_list("net.netpopup", NOTIFICATION_GROUP_ID_NONE, + notification_get_detail_list(NET_POPUP_APPID, NOTIFICATION_GROUP_ID_NONE, NOTIFICATION_PRIV_ID_NONE, -1, ¬i_list); if (noti_list != NULL) { notification_free_list(noti_list); @@ -2019,7 +2022,7 @@ static void __net_popup_add_portal_noti(app_control_h request) log_print(NET_POPUP, "Successfully added notification"); - notification_get_detail_list("net.netpopup", NOTIFICATION_GROUP_ID_NONE, + notification_get_detail_list(NET_POPUP_APPID, NOTIFICATION_GROUP_ID_NONE, NOTIFICATION_PRIV_ID_NONE, -1, ¬i_list); if (noti_list != NULL) { notification_free_list(noti_list); -- 2.7.4