From 7cedb42807647da0f1dd77efcf5939eccbd00dd7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 16 May 2013 13:21:19 +0000
Subject: - useless header removed; - unused headers removed;

git-svn-id: http://svn.miranda-ng.org/main/trunk@4669 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/common.h       |  1 -
 protocols/JabberG/src/jabber_events.cpp |  1 -
 protocols/JabberG/src/jabber_proto.cpp  |  1 -
 protocols/MSN/src/msn_links.cpp         | 12 +++++-------
 protocols/Twitter/src/common.h          |  1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'protocols')

diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index 64e0abc1b2..23084b8d35 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -75,7 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_skin.h>
 #include <statusmodes.h>
 #include <m_userinfo.h>
-#include <m_addcontact.h>
 #include <m_icolib.h>
 #include <m_utils.h>
 #include <m_hotkeys.h>
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index b0ab9625d2..442b979b09 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"
 #include "jabber_caps.h"
 #include "m_file.h"
-#include "m_addcontact.h"
 #include "jabber_disco.h"
 #include "m_proto_listeningto.h"
 
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index fd5dd54ec1..f229f2c69f 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <m_addcontact.h>
 #include <m_file.h>
 #include <m_genmenu.h>
 #include <m_icolib.h>
diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index 57f84e2e06..6d170ca7c2 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
@@ -102,17 +102,15 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 		/* does not yet check if email is current user */
 		if (hContact == NULL)
 		{
-			ADDCONTACTSTRUCT acs = {0};
-			PROTOSEARCHRESULT psr = {0};
+			PROTOSEARCHRESULT psr = { sizeof(psr) };
+			psr.flags = PSR_TCHAR;
+			psr.nick = email;
+			psr.email = email;
 
+			ADDCONTACTSTRUCT acs = {0};
 			acs.handleType = HANDLE_SEARCHRESULT;
 			acs.szProto = proto->m_szModuleName;
 			acs.psr = &psr;
-
-			psr.cbSize = sizeof(psr);
-			psr.flags = PSR_TCHAR;
-			psr.nick = email;
-			psr.email = email;
 			CallService(MS_ADDCONTACT_SHOW, 0, (LPARAM)&acs);
 		}
 		return 0;
diff --git a/protocols/Twitter/src/common.h b/protocols/Twitter/src/common.h
index a400bb84aa..20719673d0 100644
--- a/protocols/Twitter/src/common.h
+++ b/protocols/Twitter/src/common.h
@@ -62,7 +62,6 @@ using std::min;
 #include <statusmodes.h>
 #include <m_system.h>
 #include <m_userinfo.h>
-#include <m_addcontact.h>
 #include <m_icolib.h>
 #include <m_utils.h>
 #include <m_system_cpp.h>
-- 
cgit v1.2.3