From cde7d0de156b452842577b0fec03a6f706e635c1 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 3 Oct 2017 13:54:29 +0200 Subject: [PATCH] fix(ContentType): use isCPIM instead of isCpim (camel case!) --- src/chat/chat-message.cpp | 2 +- src/content/content-type.cpp | 2 +- src/content/content-type.h | 2 +- src/content/content.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chat/chat-message.cpp b/src/chat/chat-message.cpp index bbd96d9d7..239b2e1ee 100644 --- a/src/chat/chat-message.cpp +++ b/src/chat/chat-message.cpp @@ -983,7 +983,7 @@ LinphoneReason ChatMessagePrivate::receive() { // Start of message modification // --------------------------------------- - if (ContentType::isCPIM(getContentType())) { + if (ContentType::isCpim(getContentType())) { CpimChatMessageModifier ccmm; ccmm.decode(this); } diff --git a/src/content/content-type.cpp b/src/content/content-type.cpp index eb558a1c1..95fb47280 100644 --- a/src/content/content-type.cpp +++ b/src/content/content-type.cpp @@ -152,7 +152,7 @@ bool ContentType::isText (const string &contentType) { return contentType == "text/plain"; } -bool ContentType::isCPIM(const string &contentType) { +bool ContentType::isCpim(const string &contentType) { return contentType == "Message/CPIM"; } diff --git a/src/content/content-type.h b/src/content/content-type.h index 1f16ed289..746166c66 100644 --- a/src/content/content-type.h +++ b/src/content/content-type.h @@ -59,7 +59,7 @@ public: static bool isImIsComposing (const std::string &contentType); static bool isImdn (const std::string &contentType); static bool isText (const std::string &contentType); - static bool isCPIM (const std::string &contentType); + static bool isCpim (const std::string &contentType); private: L_DECLARE_PRIVATE(ContentType); diff --git a/src/content/content.h b/src/content/content.h index 352bcfcf0..084f47fc8 100644 --- a/src/content/content.h +++ b/src/content/content.h @@ -55,7 +55,7 @@ public: void setBody (const void *buffer, size_t size); size_t getSize () const; - + bool isValid() const; bool isEmpty () const;