Remove unnecessary predefined preprocessor

Change-Id: I376d831575e9c22e03691faa7ba0e3d76f682e63

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb3a526..1f8c20d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,11 +40,6 @@ IF(DEFINED SUPPORT_COMPANION_MODE)
        ENDIF(SUPPORT_COMPANION_MODE)
 ENDIF(DEFINED SUPPORT_COMPANION_MODE)
 
-IF (TIZEN_2_3_UX)
-       MESSAGE("TIZEN_2_3_UX:On")
-       ADD_DEFINITIONS("-D_TIZEN_2_3_UX")
-ENDIF(TIZEN_2_3_UX)
-
 ADD_DEFINITIONS(-DLIB_AGENT_PATH=\"${LIB_AGENT_PATH}\")
 IF(BUILD_GCOV)
        ADD_DEFINITIONS(-DBUILD_GCOV)
@@ -62,11 +57,7 @@ ADD_SUBDIRECTORY(agent)
 ADD_SUBDIRECTORY(provider-interface)
 ADD_SUBDIRECTORY(provider)
 # i18n
-IF(TIZEN_2_3_UX)
 ADD_SUBDIRECTORY(po/tizen2.3)
-ELSE(TIZEN_2_3_UX)
-ADD_SUBDIRECTORY(po/redwood)
-ENDIF(TIZEN_2_3_UX)
 
 # INSTALL
 
@@ -83,11 +74,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/download-provider.service DEST
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/download-provider.socket DESTINATION /lib/systemd/system)
 
 # install images
-IF(TIZEN_2_3_UX)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/tizen2.3/ DESTINATION ${IMAGE_DIR})
-ELSE(TIZEN_2_3_UX)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/redwood/ DESTINATION ${IMAGE_DIR})
-ENDIF(TIZEN_2_3_UX)
 
 CONFIGURE_FILE(dump-download-provider.sh.in dump-download-provider.sh @ONLY)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/dump-download-provider.sh DESTINATION ${CMAKE_LOG_DUMP_SCRIPT_DIR})

diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
index af21892..ccb5c18 100755 (executable)
--- a/agent/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@@ -121,7 +121,6 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE")
 
 ADD_DEFINITIONS("-D_ENABLE_DLOG")
 #This should be removed when release a target
-ADD_DEFINITIONS("-D_SAMSUNG_MIME_POLICY")
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS_DA})
 

diff --git a/agent/download-agent-mime-util.c b/agent/download-agent-mime-util.c
index e5b76e4..b195942 100755 (executable)
--- a/agent/download-agent-mime-util.c
+++ b/agent/download-agent-mime-util.c
@@ -51,7 +51,6 @@ Ext_translation_table ext_trans_table[MAX_EXT_TABLE_INDEX] = {
 /* This is samsung mime policy
  * 1. if the mime is audio/m4a, the extension name is defined as "m4a" for launching music player
  */
-#ifdef _SAMSUNG_MIME_POLICY
 #define MAX_SEC_MIME_TABLE_INDEX 1
 struct sec_mime_table_t {
        char *mime;
@@ -60,7 +59,6 @@ struct sec_mime_table_t {
 struct sec_mime_table_t sec_mime_table[MAX_SEC_MIME_TABLE_INDEX] = {
        {"audio/m4a",           "m4a"},
 };
-#endif
 
 const char *ambiguous_MIME_Type_list[] = {
        "text/plain",
@@ -122,7 +120,6 @@ da_ret_t da_mime_get_ext_name(char *mime, char **ext)
                int i = 0;
                ret = DA_ERR_INVALID_MIME_TYPE;
                DA_LOGV("No extension list");
-#ifdef _SAMSUNG_MIME_POLICY
                for (i = 0; i < MAX_SEC_MIME_TABLE_INDEX; i++) {
                        if (strcmp(sec_mime_table[i].mime, mime) == 0) {
                                strncpy(ext_temp, sec_mime_table[i].ext, DA_MAX_STR_LEN-1);
@@ -130,7 +127,6 @@ da_ret_t da_mime_get_ext_name(char *mime, char **ext)
                                break;
                        }
                }
-#endif
        } else { /* For drm case, this else statement is needed */
                strncpy(ext_temp, *extlist, DA_MAX_STR_LEN - 1);
                /* If only one extension name is existed, don't enter here */

diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec
index 7cac715..337a6ca 100755 (executable)
--- a/packaging/download-provider.spec
+++ b/packaging/download-provider.spec
@@ -107,7 +107,6 @@ export LDFLAGS+=" -lgcov"
        -DSUPPORT_LOG_MESSAGE:BOOL=ON \
        -DSUPPORT_OMA_DRM:BOOL=OFF \
        -DSUPPORT_COMPANION_MODE:BOOL=OFF \
-       -DTIZEN_2_3_UX:BOOL=ON \
 %if "%{?profile}" == "wearable"
        -DSUPPORT_MULTILINGUAL:BOOL=ON \
 %else

diff --git a/provider/download-provider-notification.c b/provider/download-provider-notification.c
index 7890469..6edfac4 100755 (executable)
--- a/provider/download-provider-notification.c
+++ b/provider/download-provider-notification.c
@@ -50,7 +50,6 @@
 #define DP_LOCALEDIR LOCALE_DIR
 #define DP_NOTIFICATION_NO_SUBJECT "Preparing to download..."
 
-#ifdef _TIZEN_2_3_UX
 #define DP_NOTIFICATION_DRM_ICON_PATH IMAGE_DIR"/download_manager_icon_drm.png"
 #define DP_NOTIFICATION_UNKNOWN_ICON_PATH IMAGE_DIR"/download_manager_icon_unknown.png"
 #define DP_NOTIFICATION_EXCEL_ICON_PATH IMAGE_DIR"/download_manager_icon_xls.png"
@@ -78,30 +77,6 @@
 #define DP_NOTIFICATION_DOWNLOADING_ICON_PATH "reserved://indicator/ani/downloading"
 #define DP_NOTIFICATION_FAILED_INDICATOR_ICON_PATH IMAGE_DIR"/B03_Processing_download_failed.png"
 #define DP_NOTIFICATION_COMPLETED_INDICATOR_ICON_PATH IMAGE_DIR"/B03_Processing_download_complete.png"
-#else
-#define DP_NOTIFICATION_DRM_ICON_PATH IMAGE_DIR"/U01_icon_drm.png"
-#define DP_NOTIFICATION_UNKNOWN_ICON_PATH IMAGE_DIR"/U01_icon_unkown.png"
-#define DP_NOTIFICATION_EXCEL_ICON_PATH IMAGE_DIR"/U01_icon_excel.png"
-#define DP_NOTIFICATION_HTML_ICON_PATH IMAGE_DIR"/U01_icon_html.png"
-#define DP_NOTIFICATION_MUSIC_ICON_PATH IMAGE_DIR"/U01_list_icon_mp3.png"
-#define DP_NOTIFICATION_PDF_ICON_PATH IMAGE_DIR"/U01_icon_pdf.png"
-#define DP_NOTIFICATION_PPT_ICON_PATH IMAGE_DIR"/U01_icon_ppt.png"
-#define DP_NOTIFICATION_TEXT_ICON_PATH IMAGE_DIR"/U01_icon_text.png"
-#define DP_NOTIFICATION_WORD_ICON_PATH IMAGE_DIR"/U01_icon_word.png"
-#define DP_NOTIFICATION_VIDEO_ICON_PATH IMAGE_DIR"/U01_list_icon_mp4.png"
-#define DP_NOTIFICATION_IMAGE_ICON_PATH IMAGE_DIR"/U01_list_icon_image.png"
-#define DP_NOTIFICATION_FALSH_ICON_PATH IMAGE_DIR"/U01_icon_swf.png"
-#define DP_NOTIFICATION_TPK_ICON_PATH IMAGE_DIR"/U01_icon_tpk.png"
-#define DP_NOTIFICATION_VCAL_ICON_PATH IMAGE_DIR"/U01_icon_vcs.png"
-
-#define DP_NOTIFICATION_FAILED_ICON_PATH IMAGE_DIR"/noti_download_failed.png"
-#define DP_NOTIFICATION_COMPLETED_ICON_PATH IMAGE_DIR"/noti_download_complete.png"
-
-#define DP_NOTIFICATION_ONGOING_ICON_PATH "reserved://quickpanel/ani/downloading"
-#define DP_NOTIFICATION_DOWNLOADING_ICON_PATH "reserved://indicator/ani/downloading"
-#define DP_NOTIFICATION_FAILED_INDICATOR_ICON_PATH IMAGE_DIR"/B03_processing_download_fail.png"
-#define DP_NOTIFICATION_COMPLETED_INDICATOR_ICON_PATH IMAGE_DIR"/B03_processing_download_complete.png"
-#endif
 
 #define DP_MAX_ICONS_TABLE_COUNT 15
 
@@ -452,29 +427,17 @@ int dp_notification_new(void *dbhandle, const int download_id, const int state,
                TRACE_ERROR("failed to get description id:%d error:%s", download_id, dp_print_errorcode(errorcode));
 
        if (string != NULL) {
-#ifdef _TIZEN_2_3_UX
                err = notification_set_text(noti_handle,
                                NOTIFICATION_TEXT_TYPE_CONTENT, string, NULL,
                                NOTIFICATION_VARIABLE_TYPE_NONE);
-#else
-               err = notification_set_text(noti_handle,
-                               NOTIFICATION_TEXT_TYPE_TITLE, string, NULL,
-                               NOTIFICATION_VARIABLE_TYPE_NONE);
-#endif
                free(string);
                if (err != NOTIFICATION_ERROR_NONE)
                        TRACE_ERROR("failed to set state id:%d error:%s", download_id, __dp_noti_error_str(err));
        } else {
                string = __dp_noti_status(state);
-#ifdef _TIZEN_2_3_UX
                err = notification_set_text(noti_handle,
                                NOTIFICATION_TEXT_TYPE_CONTENT, __(string), string,
                                NOTIFICATION_VARIABLE_TYPE_NONE);
-#else
-               err = notification_set_text(noti_handle,
-                               NOTIFICATION_TEXT_TYPE_TITLE, __(string), string,
-                               NOTIFICATION_VARIABLE_TYPE_NONE);
-#endif
                if (err != NOTIFICATION_ERROR_NONE)
                        TRACE_ERROR("failed to set state id:%d error:%s", download_id, __dp_noti_error_str(err));
        }
@@ -488,15 +451,9 @@ int dp_notification_new(void *dbhandle, const int download_id, const int state,
        if (string == NULL)
                string = dp_strdup(DP_NOTIFICATION_NO_SUBJECT);
        if (string != NULL) {
-#ifdef _TIZEN_2_3_UX
                err = notification_set_text(noti_handle,
                                NOTIFICATION_TEXT_TYPE_TITLE, string, NULL,
                                NOTIFICATION_VARIABLE_TYPE_NONE);
-#else
-               err = notification_set_text(noti_handle,
-                               NOTIFICATION_TEXT_TYPE_CONTENT, string, NULL,
-                               NOTIFICATION_VARIABLE_TYPE_NONE);
-#endif
                free(string);
                string = NULL;
                if (err != NOTIFICATION_ERROR_NONE)