fixes #4223 (Добавьте возможность задания глобального никнейма)

5 files changed, 7 insertions, 34 deletions

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 2552a33a4f..89b367427f 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -260,22 +260,15 @@ wchar_t* Protocol::GetNick()
 	return nickname;

 }

 

-bool Protocol::CanSetNick()

-{

-	return can_set_nick;

-}

-

 void Protocol::SetNick(const wchar_t *nick)

 {

-	// See if can get one

-	if (!CanSetNick())

-		return;

-

 	if (nick == nullptr)

 		return;

 

-	// Get it

-	CallProtoService(name, PS_SETMYNICKNAME, SMNN_UNICODE, (LPARAM)nick);

+	if (can_set_nick)

+		CallProtoService(name, PS_SETMYNICKNAME, SMNN_UNICODE, (LPARAM)nick);

+	else

+		db_set_ws(0, name, "MyHandle", nick);

 }

 

 bool Protocol::CanSetAvatar()

diff --git a/plugins/MyDetails/src/data.h b/plugins/MyDetails/src/data.h
index ece3d8d9fc..1885fa27a6 100644
--- a/plugins/MyDetails/src/data.h
+++ b/plugins/MyDetails/src/data.h
@@ -74,7 +74,6 @@ public:
 	//void SetAvatar(const char *file_name, HBITMAP hBmp);

 

 	wchar_t *GetNick();			// Copy to cache and return a copy

-	bool CanSetNick();

 	void SetNick(const wchar_t *nick);

 

 	bool CanGetListeningTo();

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index fbbbbb34a7..6bf9c4761d 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -1182,7 +1182,7 @@ void Draw(HWND hwnd, HDC hdc_orig)
 		SelectObject(hdc, hFont[FONT_NICK]);

 		SetTextColor(hdc, font_colour[FONT_NICK]);

 

-		DrawTextWithRect(hdc, proto->nickname, DEFAULT_NICKNAME, rc, uFormat, data->mouse_over_nick && proto->CanSetNick(), *proto);

+		DrawTextWithRect(hdc, proto->nickname, DEFAULT_NICKNAME, rc, uFormat, data->mouse_over_nick, *proto);

 

 		// Clipping rgn

 		SelectClipRgn(hdc, nullptr);

@@ -1628,7 +1628,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					CallService(MS_MYDETAILS_SETMYAVATARUI, 0, (LPARAM)proto->name);

 			}

 			// In nick?

-			else if (data->draw_nick && InsideRect(&p, &data->nick_rect) && proto->CanSetNick()) {

+			else if (data->draw_nick && InsideRect(&p, &data->nick_rect)) {

 				if (opts.global_on_nickname)

 					CallService(MS_MYDETAILS_SETMYNICKNAMEUI, 0, 0);

 				else

@@ -1774,12 +1774,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				mii.dwTypeData = tmp;

 				mii.cch = (int)mir_wstrlen(tmp);

 				mii.wID = 1;

-

-				if (!proto->CanSetNick()) {

-					mii.fMask |= MIIM_STATE;

-					mii.fState = MFS_DISABLED;

-				}

-

 				InsertMenuItem(submenu, 0, TRUE, &mii);

 

 				ClientToScreen(hwnd, &p);

@@ -1957,12 +1951,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				mii.dwTypeData = tmp;

 				mii.cch = (int)mir_wstrlen(tmp);

 				mii.wID = 2;

-

-				if (!proto->CanSetNick()) {

-					mii.fMask |= MIIM_STATE;

-					mii.fState = MFS_DISABLED;

-				}

-

 				InsertMenuItem(submenu, 0, TRUE, &mii);

 

 				mir_snwprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description);

diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp
index 661dfda26b..4ab290466a 100644
--- a/plugins/MyDetails/src/services.cpp
+++ b/plugins/MyDetails/src/services.cpp
@@ -118,10 +118,6 @@ INT_PTR PluginCommand_SetMyNicknameUI(WPARAM, LPARAM lParam)
 

 		if (proto_num == -1)

 			return -1;

-

-		if (!protocols[proto_num]->CanSetNick())

-			return -2;

-

 	}

 

 	if (pSetNickDialog == nullptr) {

@@ -142,9 +138,6 @@ INT_PTR PluginCommand_SetMyNickname(WPARAM wParam, LPARAM lParam)
 	if (proto != nullptr) {

 		for (auto &it : protocols) {

 			if (mir_strcmpi(it->name, proto) == 0) {

-				if (!it->CanSetNick())

-					return -2;

-

 				it->SetNick((wchar_t *)lParam);

 				return 0;

 			}

diff --git a/plugins/MyDetails/src/version.h b/plugins/MyDetails/src/version.h
index 99746d161d..4c4a3ba84b 100644
--- a/plugins/MyDetails/src/version.h
+++ b/plugins/MyDetails/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          1

 #define __RELEASE_NUM            0

-#define __BUILD_NUM              2

+#define __BUILD_NUM              3

 

 #include <stdver.h>