From: Sangkoo Kim <sangkoo.kim@samsung.com>
Date: Fri, 24 Aug 2012 04:44:01 +0000 (+0900)
Subject: Remove phone-misc
X-Git-Tag: 2.0_alpha~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=301cb07d3ba0a8614f1919ba7893255a9f2257ac;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git

Remove phone-misc
---

diff --git a/framework/main.cpp b/framework/main.cpp
index 35a485b..48fe01a 100755
--- a/framework/main.cpp
+++ b/framework/main.cpp
@@ -412,9 +412,6 @@ signal( SIGCHLD, SIG_IGN );
 	// Regist vconf CB.
 	MsgSettingRegVconfCB();
 
-	// Call-log DB init.
-	MsgCalllogDBInit();
-
 	try
 	{
 		// plugin manager initialize
@@ -458,9 +455,6 @@ signal( SIGCHLD, SIG_IGN );
 		MSG_DEBUG("Fail to start Messaging Framework!!!");
 	}
 
-	// Close calllog DB.
-	MsgCalllogDBFinish();
-
 	// Remove vconf CB
 	MsgSettingRemoveVconfCB();
 
diff --git a/include/utils/MsgSpamFilter.h b/include/utils/MsgSpamFilter.h
index fa0a909..d776c8e 100755
--- a/include/utils/MsgSpamFilter.h
+++ b/include/utils/MsgSpamFilter.h
@@ -33,7 +33,5 @@ msg_error_t MsgSetFilterOperation(bool bSetFlag);
 msg_error_t MsgGetFilterOperation(bool *pSetFlag);
 
 bool MsgCheckFilter(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsgInfo);
-void MsgCalllogDBInit(void);
-void MsgCalllogDBFinish(void);
 
 #endif // MSG_SPAM_FILTER_H
diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec
index 3955bab..47d1ee8 100755
--- a/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@ -1,7 +1,7 @@
 Name:           msg-service
 Version:        0.9.0
 Release:        1
-License:        Apache License v2.0
+License:        Samsung
 Summary:        Messaging Framework Library
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(mm-player)
 BuildRequires: pkgconfig(mm-session)
 BuildRequires: pkgconfig(network)
 BuildRequires: pkgconfig(notification)
-BuildRequires: pkgconfig(phone-misc)
 BuildRequires: pkgconfig(pmapi)
 BuildRequires: pkgconfig(mmutil-imgp)
 BuildRequires: pkgconfig(mmutil-jpeg)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 3fcb101..ab89733 100755
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES(
 )
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(utils_pkgs REQUIRED glib-2.0 vconf db-util contacts-service dlog pmapi mm-session alarm-service notification phone-misc drm-client)
+pkg_check_modules(utils_pkgs REQUIRED glib-2.0 vconf db-util contacts-service dlog pmapi mm-session alarm-service notification drm-client)
 
 FOREACH(flag ${utils_pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
diff --git a/utils/MsgSpamFilter.cpp b/utils/MsgSpamFilter.cpp
index 21a10e3..0b05523 100755
--- a/utils/MsgSpamFilter.cpp
+++ b/utils/MsgSpamFilter.cpp
@@ -20,16 +20,6 @@
 #include "MsgGconfWrapper.h"
 #include "MsgSpamFilter.h"
 
-extern "C" {
-#include <phone-misc.h>
-}
-
-/*==================================================================================================
-                                     VARIABLES
-==================================================================================================*/
-phone_misc_h *calllogHandle = NULL;
-
-
 /*==================================================================================================
                                      FUNCTION IMPLEMENTATION
 ==================================================================================================*/
@@ -93,9 +83,6 @@ bool MsgCheckFilter(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsgInfo)
 		if (checkNumber[0] == '\0') {
 			if (MsgSettingGetUnknownAutoReject())
 				return true;
-		} else {
-			ret = phone_misc_block_check(calllogHandle, checkNumber);
-			MSG_DEBUG("phone_misc_block_check [%d]", ret);
 		}
 
 		if (ret > 0) {
@@ -254,25 +241,3 @@ bool MsgCheckFilter(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsgInfo)
 
 	return false;
 }
-
-void MsgCalllogDBInit(void)
-{
-	MSG_BEGIN();
-
-	if (calllogHandle == NULL)
-		calllogHandle = phone_misc_connect();
-
-	MSG_END();
-}
-
-void MsgCalllogDBFinish(void)
-{
-	MSG_BEGIN();
-
-	if (calllogHandle != NULL) {
-		if (phone_misc_disconnect(calllogHandle) == PH_MISC_SUCCESS)
-			calllogHandle = NULL;
-	}
-
-	MSG_END();
-}