4 files changed, 15 insertions, 13 deletions
diff --git a/otr/common.h b/otr/common.h
index 028e7ca..5d7edb0 100644
--- a/otr/common.h
+++ b/otr/common.h
@@ -19,7 +19,6 @@
 #include <statusmodes.h>
 #include <m_options.h>
 #include <m_langpack.h>
-#include <m_popup.h>
 #include <m_system.h>
 #include <m_skin.h>
 #include <m_netlib.h>
@@ -36,7 +35,7 @@
 #include <m_updater.h>
 #include <m_metacontacts.h>
 
-#include <m_popup.h>
+#include <m_yapp.h>
 #include <m_icolib.h>
 #include <m_folders.h>
 
diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index c9ae5a2..53a08f9 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -129,9 +129,13 @@ extraResourceOptions=
 30=..\..\include\m_updater.h
 31=..\..\include\m_database.h
 [History]
-..\..\include\m_protosvc.h,21646
-..\..\include\m_protocols.h,0
-..\..\include\m_protomod.h,0
+dllmain.cpp,0
 ..\..\include\m_database.h,16842
-dllmain.cpp,30072
+..\..\include\m_protomod.h,0
+..\..\include\m_protocols.h,0
+..\..\include\m_protosvc.h,21646
+utils.cpp,41
+common.h,414
+..\..\include\m_yapp.h,1938
+utils.h,0
 otr_private.h,171
diff --git a/otr/otr_private.h b/otr/otr_private.h
index 5c7ed4f..1b53236 100644
--- a/otr/otr_private.h
+++ b/otr/otr_private.h
@@ -5,7 +5,7 @@
 #define VER_MAJOR				0
 #define VER_MINOR				5
 #define VER_RELEASE				5
-#define VER_BUILD				1
+#define VER_BUILD				2
 
 #define __STRINGIZE(x)			#x
 #define VER_STRING				__STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )
diff --git a/otr/utils.cpp b/otr/utils.cpp
index 79e4a2d..9f77b2c 100644
--- a/otr/utils.cpp
+++ b/otr/utils.cpp
@@ -1,6 +1,5 @@
 #include "common.h"
 #include "utils.h"
-#include "../../include/m_popup.h"
 #include "options.h"
 #include "menu.h"
 
@@ -60,7 +59,7 @@ void ShowPopup( const char* line1, const char* line2, int timeout )
 		return;
 	}
 
-	if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
+	if(ServiceExists(MS_YAPP_CLASSINSTANCE)) {
 		ShowClassPopup(popup_class_name, (char *)line1, (char *)line2);
 	} else {
 		POPUPDATAEX* ppd = ( POPUPDATAEX* )calloc( sizeof( POPUPDATAEX ), 1 );
@@ -276,16 +275,16 @@ void InitUtils() {
 		hUnlockIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_STOP), IMAGE_ICON, 16, 16, 0);
 	}
 
-	if(ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {
+	if(ServiceExists(MS_YAPP_REGISTERCLASS)) {
 		mir_snprintf(popup_class_name, 128, "%s/Notify", MODULE);
 
-		POPUPCLASS test = {0};
+		PopupClass test = {0};
 		test.cbSize = sizeof(test);
 		test.hIcon = hProtoIcon;
 		test.pszDescription = Translate("OTR");
 		test.pszName = popup_class_name;
-		test.PluginWindowProc = NullWindowProc;
-		CallService(MS_POPUP_REGISTERCLASS, 0, (WPARAM)&test);
+		test.windowProc = NullWindowProc;
+		CallService(MS_YAPP_REGISTERCLASS, 0, (WPARAM)&test);
 	}
 
 }