nasty error messageBox removed from SmileyAdd and replaced with a popup

git-svn-id: http://svn.miranda-ng.org/main/trunk@3944 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 3 insertions, 20 deletions

diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp
index bfac97ae54..dd9623d6a5 100644
--- a/plugins/SmileyAdd/src/general.cpp
+++ b/plugins/SmileyAdd/src/general.cpp
@@ -266,20 +266,11 @@ bool IsSmileyProto(char* proto)
 void ReportError(const TCHAR* errmsg)

 {

 	static const TCHAR title[] = _T("Miranda SmileyAdd");

-/*

-

-	POPUPDATAW pd = {0};

-

 

+	POPUPDATAT pd = {0};

 	_tcscpy(pd.lpwzContactName, title);

 	_tcscpy(pd.lpwzText, errmsg);

-

 	pd.iSeconds = -1;

-

-

-	bool popupFail = PUAddPopUpW(&pd)  != CALLSERVICE_NOTFOUND;

-

-	if (popupFail)

-*/		

+	if (PUAddPopUpT(&pd) == CALLSERVICE_NOTFOUND)

 		MessageBox(NULL, errmsg, title, MB_OK | MB_ICONWARNING | MB_TOPMOST);

 }
\ No newline at end of file
diff --git a/plugins/SmileyAdd/src/general.h b/plugins/SmileyAdd/src/general.h
index b16851fb3e..182d2007c3 100644
--- a/plugins/SmileyAdd/src/general.h
+++ b/plugins/SmileyAdd/src/general.h
@@ -56,6 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_button.h>

 #include <m_message.h>

 #include <m_netlib.h>

+#include <m_popup.h>

 #include <m_icolib.h>

 #include <m_genmenu.h>

 #include <m_imgsrvc.h>

diff --git a/plugins/SmileyAdd/src/smileyroutines.cpp b/plugins/SmileyAdd/src/smileyroutines.cpp
index 11ea5e6d01..63440e4a83 100644
--- a/plugins/SmileyAdd/src/smileyroutines.cpp
+++ b/plugins/SmileyAdd/src/smileyroutines.cpp
@@ -510,17 +510,8 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const
 

 	TextDocument->Release();

 	RichEditOle->Release();

-

-/*

-	QueryPerformanceCounter(&end);

-	unsigned dif = (end.QuadPart - strt.QuadPart)/(freq.QuadPart/1000);

-	TCHAR mess[300];

-	wsprintf(mess, _T("Time elapsed: %u"), dif);

-	MessageBox(NULL, mess, _T(""), MB_OK);

-*/

 }

 

-

 void ReplaceSmileysWithText(HWND hwnd, CHARRANGE& sel, bool keepFrozen)

 {

 	IRichEditOle* RichEditOle = NULL;