Backout Bug 983347 - Need different paths for displaying to the screen and sending over the wire. Obsolete patch committed.
authorPatrick Cloke <clokep@gmail.com>
Sun, 14 Sep 2014 18:06:45 -0400
changeset 751 ecb887e33c3395414037709cf07c5231e4941808
parent 750 d971cac153eee1e43be74ccd844e1e8ffb513309
child 752 6550fcf407f0b1bd6b9574e93daf9130267f7839
push id31
push userclokep@gmail.com
push dateSun, 14 Sep 2014 22:10:44 +0000
bugs983347
Backout Bug 983347 - Need different paths for displaying to the screen and sending over the wire. Obsolete patch committed.
purplexpcom/src/purpleConvChat.h
purplexpcom/src/purpleConvIM.h
purplexpcom/src/purpleConversation.cpp
--- a/purplexpcom/src/purpleConvChat.h
+++ b/purplexpcom/src/purpleConvChat.h
@@ -55,19 +55,16 @@ public:
     return purpleConversation::Close();
   }
   NS_IMETHOD AddObserver(nsIObserver *aObserver) {
     return purpleConversation::AddObserver(aObserver);
   }
   NS_IMETHOD RemoveObserver(nsIObserver *aObserver) {
     return purpleConversation::RemoveObserver(aObserver);
   }
-  NS_IMETHOD PrepareForSending(imIOutgoingMessage *message, uint32_t *messageCount, char16_t * **messages) {
-    return purpleConversation::PrepareForSending(message, messageCount, messages);
-  }
 
   // Keep the SendMsg method here
   NS_IMETHOD SendMsg(const nsACString & aMsg);
 
   purpleConvChat();
 
 private:
   ~purpleConvChat();
--- a/purplexpcom/src/purpleConvIM.h
+++ b/purplexpcom/src/purpleConvIM.h
@@ -50,19 +50,16 @@ public:
     return purpleConversation::Close();
   }
   NS_IMETHOD AddObserver(nsIObserver *aObserver) {
     return purpleConversation::AddObserver(aObserver);
   }
   NS_IMETHOD RemoveObserver(nsIObserver *aObserver) {
     return purpleConversation::RemoveObserver(aObserver);
   }
-  NS_IMETHOD PrepareForSending(imIOutgoingMessage *message, uint32_t *messageCount, char16_t * **messages) {
-    return purpleConversation::PrepareForSending(message, messageCount, messages);
-  }
 
   // Keep the SendMsg and SendTyping methods here.
   NS_IMETHOD SendMsg(const nsACString & aMsg);
   NS_IMETHODIMP SendTyping(const nsACString & aString, int32_t *_retval);
 
   purpleConvIM();
 
 private:
--- a/purplexpcom/src/purpleConversation.cpp
+++ b/purplexpcom/src/purpleConversation.cpp
@@ -146,23 +146,16 @@ NS_IMETHODIMP purpleConversation::SetId(
 }
 
 /* void sendMsg (in AUTF8String aMsg); */
 NS_IMETHODIMP purpleConversation::SendMsg(const nsACString& aMsg)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-/* void prepareForSending (in imIOutgoingMessage message, [optional] out unsigned long messageCount, [array, size_is (messageCount), retval] out wstring messages); */
-NS_IMETHODIMP purpleConversation::PrepareForSending(imIOutgoingMessage *message, uint32_t *messageCount, char16_t * **messages)
-{
-  messages = NULL;
-  return NS_OK;
-}
-
 /* void sendTyping (in unsigned long aLength); */
 NS_IMETHODIMP purpleConversation::SendTyping(const nsACString & aString, int32_t *_retval)
 {
   *_retval = purpleConversation::NO_TYPING_LIMIT;
   return NS_OK;
 }
 
 /* void close (); */