Revert "Own message loopback tracking implementation"

This reverts commit f1f0c97.

Author: vitalyster

backends/libpurple/loopback.cpp

@@ -43,12 +43,14 @@
 #endif
 
 #include "purple_defs.h"
-#include "loopback.h"
 
 DEFINE_LOGGER(logger_libpurple, "libpurple");
 DEFINE_LOGGER(logger, "backend");
 
-MessageLoopbackTracker *loopbackTracker; //Tracks outgoing messages to ignore loopbacks
+/* Additional PURPLE_MESSAGE_* flags as a hack to track the origin of the message. */
+typedef enum {
+    PURPLE_MESSAGE_SPECTRUM2_ORIGINATED = 0x80000000,
+} PurpleMessageSpectrum2Flags;
 
 int main_socket;
 static int writeInput;
@@ -612,7 +614,6 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 				}
 				if (xhtml.empty()) {
 					gchar *_markup = purple_markup_escape_text_wrapped(message.c_str(), -1);
-					loopbackTracker->add(conv, _markup);
 					if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 						purple_conv_im_send_with_flags_wrapped(PURPLE_CONV_IM_WRAPPED(conv), _markup, static_cast<PurpleMessageFlags>(PURPLE_MESSAGE_SPECTRUM2_ORIGINATED));
 					}
@@ -622,7 +623,6 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
 					g_free(_markup);
 				}
 				else {
-					loopbackTracker->add(conv, xhtml);
 					if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 						purple_conv_im_send_with_flags_wrapped(PURPLE_CONV_IM_WRAPPED(conv), xhtml.c_str(), static_cast<PurpleMessageFlags>(PURPLE_MESSAGE_SPECTRUM2_ORIGINATED));
 					}
@@ -1483,17 +1483,8 @@ static void conv_write_im(PurpleConversation *conv, const char *who, const char
 	if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_IM) {
 		//Don't forwards our own messages, but do forward messages "from=us" which originated elsewhere
 		//(such as carbons of our messages from other legacy network clients)
-		
-		//First check by list so that if a message is there it's removed
-		//and does not inhibit another one later
-		if (loopbackTracker->matchAndRemove(conv, msg, mtime)) {
-			LOG4CXX_DEBUG(logger, "conv_write_im(): ignoring a message matching one we sent (flags=" << flags << ")");
-			return;
-		}
-
-		//Many libpurple protocols preserve flags so try to match by that too
 		if (flags & PURPLE_MESSAGE_SPECTRUM2_ORIGINATED) {
-			LOG4CXX_DEBUG(logger, "conv_write_im(): ignoring a message generated by us (flags=" << flags << ")");
+			LOG4CXX_INFO(logger, "conv_write_im(): ignoring a message generated by us");
 			return;
 		}
 
@@ -1503,7 +1494,7 @@ static void conv_write_im(PurpleConversation *conv, const char *who, const char
 
 		//Ignore system messages as those are normally not true messages in the XMPP sense
 		if (flags & PURPLE_MESSAGE_SYSTEM) {
-			LOG4CXX_DEBUG(logger, "conv_write_im(): ignoring a system message");
+			LOG4CXX_INFO(logger, "conv_write_im(): ignoring a system message");
 			return;
 		}
 	}
@@ -2554,9 +2545,6 @@ int main(int argc, char **argv) {
 	purple_input_add_wrapped(main_socket, PURPLE_INPUT_READ, &transportDataReceived, NULL);
 	purple_timeout_add_seconds_wrapped(30, pingTimeout, NULL);
 
-	loopbackTracker = new MessageLoopbackTracker();
-	loopbackTracker->setAutotrim(true);
-
 	np = new SpectrumNetworkPlugin();
 
 	GMainLoop *m_loop;