avatars related code cleaning & reordering

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

3 files changed, 2 insertions, 17 deletions

diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h
index 1a968b3327..dca54c9d74 100644
--- a/plugins/MyDetails/src/commons.h
+++ b/plugins/MyDetails/src/commons.h
@@ -70,7 +70,6 @@ extern long nickname_dialog_open;
 extern long status_msg_dialog_open;

 extern bool g_bFramesExist;

 

-#define PS_GETMYAVATARMAXSIZE "/GetMyAvatarMaxSize"

 #define PS_GETMYNICKNAMEMAXLENGTH "/GetMyNicknameMaxLength"

 

 // Helper

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 2f3ba4448b..62ae12d604 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -59,13 +59,6 @@ Protocol::Protocol(const char *aName, const TCHAR* descr)
 	lstrcpynA(name, aName, SIZEOF(name));

 	lstrcpyn(description, descr, SIZEOF(description));

 

-	nickname[0] = _T('\0');

-	status_message[0] = _T('\0');

-	listening_to[0] = _T('\0');

-	ace = NULL;

-	avatar_file[0] = _T('\0');

-	avatar_bmp = NULL;

-	custom_status = 0;

 	data_changed = true;

 

 	// Load services

@@ -79,16 +72,9 @@ Protocol::Protocol(const char *aName, const TCHAR* descr)
 

 	can_have_listening_to = (ProtoServiceExists(name, PS_SET_LISTENINGTO) != 0);

 

+	PF3 = CallProtoService(name, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0);

 	caps = CallProtoService(name, PS_GETCAPS, PFLAGNUM_4, 0);

 	can_have_avatar = (caps & PF4_AVATARS) != 0;

-

-	PF3 = CallProtoService(name, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0);

-

-	avatar_max_width = 0;

-	avatar_max_height = 0;

-	if (ProtoServiceExists(name, PS_GETMYAVATARMAXSIZE))

-		CallProtoService(name, PS_GETMYAVATARMAXSIZE, (WPARAM) &avatar_max_width, (LPARAM) &avatar_max_height);

-

 	can_set_nick = ProtoServiceExists(name, PS_SETMYNICKNAME) != FALSE;

 

 	// Initial value

diff --git a/plugins/MyDetails/src/data.h b/plugins/MyDetails/src/data.h
index 8578d993d2..f2ab3e555a 100644
--- a/plugins/MyDetails/src/data.h
+++ b/plugins/MyDetails/src/data.h
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.
 

 //#include "protocol_config.h"

 

-class Protocol

+class Protocol : public MZeroedObject

 {

 	// Attributes ////////////

 protected: