[Messaging] Inclusion of msg_product.h has been removed.

Function calls which use enumerations defined in that file
were removed as well, as they are redundant and values set
by these calls were never read.

Change-Id: I8fba1320f6f8b7d81deeb91edb5f070c7d616d19

diff --git a/src/messaging/message.cc b/src/messaging/message.cc
index fa4753bf7d62fd7a10cd14d84d7bc6a612725276..2114cd7db4949e602f860c277c5295c7aefc90bf 100644 (file)
--- a/src/messaging/message.cc
+++ b/src/messaging/message.cc
@@ -746,9 +746,6 @@ void Message::addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector attach,
                 unsigned int type = MessageAttachment::MIMETypeStringToEnum(
                         attach.at(i)->getMimeType());
                 msg_set_int_value(tmpAtt, MSG_MMS_ATTACH_MIME_TYPE_INT, type);
-                msg_set_str_value(tmpAtt, MSG_MMS_ATTACH_CONTENT_TYPE_STR,
-                                    const_cast<char*>(attach.at(i)->getMimeType().c_str()),
-                                    MSG_MSG_ID_LEN);
 
 
                 LoggerD("att[%d]: setting mime type:0x%x (orignal:%s)", i, type,
@@ -911,8 +908,6 @@ msg_struct_t Message::convertPlatformShortMessageToStruct(Message* message,
                 LoggerE("Message(%p): Failed to set mms body filepath", message);
                 throw common::UnknownException("Failed to set mms body filepath");
             }
-            msg_set_str_value(media, MSG_MMS_MEDIA_CONTENT_TYPE_STR,
-                "text/plain", 10);
 
             //----------------------------------------------------------------------------
             //Smile text

diff --git a/src/messaging/message.h b/src/messaging/message.h
index 0ef73cda2260dcf208c7c2043376bad394e3f26f..0c66d1a1f11ba5f93eb0e704a9cebc4d04db3211 100644 (file)
--- a/src/messaging/message.h
+++ b/src/messaging/message.h
@@ -12,7 +12,6 @@
 #include <vector>
 #include <memory>
 #include <msg.h>
-#include <msg_product.h>
 #include <msg_storage.h>
 #include <email-api.h>
 #include <TelNetwork.h>