2 files changed, 2 insertions, 29 deletions
diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index db7b574e10..cd36490c21 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -20,9 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 CAimProto::CAimProto(const char* aProtoName, const TCHAR* aUserName)
 	: chat_rooms(5)
 {
-	m_iVersion = 2;
-	m_tszUserName = mir_tstrdup(aUserName);
-	m_szModuleName = mir_strdup(aProtoName);
+	ProtoConstructor(this, aProtoName, aUserName);
 	m_szProtoName = mir_strdup(aProtoName);
 	_strlwr(m_szProtoName);
 	m_szProtoName[0] = (char)toupper(m_szProtoName[0]);
@@ -115,9 +113,8 @@ CAimProto::~CAimProto()
 	mir_free(ADMIN_COOKIE);
 	mir_free(username);
 
-	mir_free(m_szModuleName);
-	mir_free(m_tszUserName);
 	mir_free(m_szProtoName);
+	ProtoDestructor(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -355,29 +352,6 @@ DWORD_PTR __cdecl CAimProto::GetCaps(int type, HANDLE hContact)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
-// GetIcon - loads an icon for the contact list
-
-HICON __cdecl CAimProto::GetIcon(int iconIndex)
-{
-	if (LOWORD(iconIndex) == PLI_PROTOCOL)
-	{
-		if (iconIndex & PLIF_ICOLIBHANDLE)
-			return (HICON)GetIconHandle("aim");
-
-		bool big = (iconIndex & PLIF_SMALL) == 0;
-		HICON hIcon = LoadIconEx("aim", big);
-
-		if (iconIndex & PLIF_ICOLIB)
-			return hIcon;
-
-		hIcon =  CopyIcon(hIcon);
-		ReleaseIconEx("aim", big);
-		return hIcon;
-	}
-	return NULL;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
 // GetInfo - retrieves a contact info
 
 int __cdecl CAimProto::GetInfo(HANDLE hContact, int infoType)
diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h
index bb4dc3c601..b964c3ce17 100644
--- a/protocols/AimOscar/src/proto.h
+++ b/protocols/AimOscar/src/proto.h
@@ -52,7 +52,6 @@ struct CAimProto : public PROTO_INTERFACE, public MZeroedObject
 	virtual	int    __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename );
 
 	virtual	DWORD_PTR __cdecl GetCaps( int type, HANDLE hContact = NULL );
-	virtual	HICON  __cdecl GetIcon( int iconIndex );
 	virtual	int    __cdecl GetInfo( HANDLE hContact, int infoType );
 
 	virtual	HANDLE __cdecl SearchBasic( const PROTOCHAR* id );