fixes #2820 (useless "Network" field in Options - IRC - Ignore)

7 files changed, 32 insertions, 59 deletions

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 5779eeca10..b8b8c7ba78 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -2414,21 +2414,17 @@ int CIrcProto::IsIgnored(CMStringW user, char type)
 			if (!wcschr(C.flags, type))

 				continue;

 

-			if (C.network.IsEmpty())

-				return i + 1;

-

-			if (IsConnected() && !mir_wstrcmpi(C.network, _A2T(m_szModuleName)))

-				return i + 1;

+			return i + 1;

 		}

 	}

 

 	return 0;

 }

 

-bool CIrcProto::AddIgnore(const wchar_t* mask, const wchar_t* flags, const wchar_t* network)

+bool CIrcProto::AddIgnore(const wchar_t* mask, const wchar_t* flags)

 {

 	RemoveIgnore(mask);

-	m_ignoreItems.insert(new CIrcIgnoreItem(mask, (L"+" + CMStringW(flags)), network));

+	m_ignoreItems.insert(new CIrcIgnoreItem(mask, (L"+" + CMStringW(flags))));

 	RewriteIgnoreSettings();

 

 	if (m_ignoreDlg)

diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index c43e7a1e84..2e1de9fb59 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -289,15 +289,9 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo
 			}

 			else IgnoreFlags = L"qnidc";

 

-			CMStringW szNetwork;

-			if (three.IsEmpty())

-				szNetwork = m_szModuleName;

-			else

-				szNetwork = three;

-

-			AddIgnore(one.c_str(), IgnoreFlags.c_str(), szNetwork.c_str());

+			AddIgnore(one.c_str(), IgnoreFlags.c_str());

 

-			mir_snwprintf(temp, TranslateT("%s on %s is now ignored (+%s)"), one.c_str(), szNetwork.c_str(), IgnoreFlags.c_str());

+			mir_snwprintf(temp, TranslateT("%s is now ignored (+%s)"), one.c_str(), IgnoreFlags.c_str());

 			DoEvent(GC_EVENT_INFORMATION, nullptr, m_info.sNick.c_str(), temp, nullptr, nullptr, NULL, true, false);

 		}

 		return true;

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index af2cb873ef..0fe6ed79ef 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -581,17 +581,15 @@ void CIrcProto::CheckDCCTimeout(void)
 
 ////////////////////////////////////////////////////////////////////
 
-CIrcIgnoreItem::CIrcIgnoreItem(const wchar_t* _mask, const wchar_t* _flags, const wchar_t* _network) :
+CIrcIgnoreItem::CIrcIgnoreItem(const wchar_t* _mask, const wchar_t* _flags) :
 	mask(_mask),
-	flags(_flags),
-	network(_network)
+	flags(_flags)
 {
 }
 
-CIrcIgnoreItem::CIrcIgnoreItem(int codepage, const char* _mask, const char* _flags, const char* _network) :
+CIrcIgnoreItem::CIrcIgnoreItem(int codepage, const char* _mask, const char* _flags) :
 	mask((wchar_t*)_A2T(_mask, codepage)),
-	flags((wchar_t*)_A2T(_flags, codepage)),
-	network((wchar_t*)_A2T(_network, codepage))
+	flags((wchar_t*)_A2T(_flags, codepage))
 {
 }
 
diff --git a/protocols/IRCG/src/irclib.h b/protocols/IRCG/src/irclib.h
index 9b32b78ebf..7b4524f16e 100644
--- a/protocols/IRCG/src/irclib.h
+++ b/protocols/IRCG/src/irclib.h
@@ -115,11 +115,11 @@ struct CIrcSessionInfo
 

 struct CIrcIgnoreItem

 {

-	CIrcIgnoreItem( const wchar_t*, const wchar_t*, const wchar_t* );

-	CIrcIgnoreItem( int codepage, const char*, const char*, const char* );

+	CIrcIgnoreItem(const wchar_t *, const wchar_t *);

+	CIrcIgnoreItem(int codepage, const char *, const char *);

 	~CIrcIgnoreItem();

 

-   CMStringW mask, flags, network;

+   CMStringW mask, flags;

 };

 

 ////////////////////////////////////////////////////////////////////

diff --git a/protocols/IRCG/src/ircproto.h b/protocols/IRCG/src/ircproto.h
index a4ab1ce5bd..6f1a5d1ff1 100644
--- a/protocols/IRCG/src/ircproto.h
+++ b/protocols/IRCG/src/ircproto.h
@@ -208,7 +208,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	void __cdecl DoPerformThread(void *di);
 	void __cdecl ResolveIPThread(void *di);
 
-	bool AddIgnore(const wchar_t *mask, const wchar_t *mode, const wchar_t *network);
+	bool AddIgnore(const wchar_t *mask, const wchar_t *mode);
 	int  IsIgnored(const CMStringW &nick, const CMStringW &address, const CMStringW &host, char type);
 	int  IsIgnored(CMStringW user, char type);
 	bool RemoveIgnore(const wchar_t *mask);
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index b93cf61176..a4af457627 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -856,7 +856,6 @@ struct CAddIgnoreDlg : public CIrcBaseDlg
 	bool OnApply() override

 	{

 		wchar_t szMask[500];

-		wchar_t szNetwork[500];

 		CMStringW flags;

 		if (IsDlgButtonChecked(m_hwnd, IDC_Q) == BST_CHECKED) flags += 'q';

 		if (IsDlgButtonChecked(m_hwnd, IDC_N) == BST_CHECKED) flags += 'n';

@@ -866,7 +865,6 @@ struct CAddIgnoreDlg : public CIrcBaseDlg
 		if (IsDlgButtonChecked(m_hwnd, IDC_M) == BST_CHECKED) flags += 'm';

 

 		GetDlgItemText(m_hwnd, IDC_MASK, szMask, _countof(szMask));

-		GetDlgItemText(m_hwnd, IDC_NETWORK, szNetwork, _countof(szNetwork));

 

 		CMStringW Mask = GetWord(szMask, 0);

 		if (Mask.GetLength() != 0) {

@@ -876,7 +874,7 @@ struct CAddIgnoreDlg : public CIrcBaseDlg
 			if (!flags.IsEmpty()) {

 				if (*szOldMask)

 					m_proto->RemoveIgnore(szOldMask);

-				m_proto->AddIgnore(Mask.c_str(), flags.c_str(), szNetwork);

+				m_proto->AddIgnore(Mask.c_str(), flags.c_str());

 			}

 		}

 		return true;

@@ -946,9 +944,8 @@ void CIrcProto::InitIgnore(void)
 

 			CMStringA mask = GetWord(p1, 0);

 			CMStringA flags = GetWord(p1, 1);

-			CMStringA network = GetWord(p1, 2);

 			if (!mask.IsEmpty())

-				m_ignoreItems.insert(new CIrcIgnoreItem(getCodepage(), mask.c_str(), flags.c_str(), network.c_str()));

+				m_ignoreItems.insert(new CIrcIgnoreItem(getCodepage(), mask.c_str(), flags.c_str()));

 

 			p1 = p2;

 		}

@@ -970,8 +967,7 @@ void CIrcProto::InitIgnore(void)
 

 		CMStringW mask = GetWord(dbv.pwszVal, 0);

 		CMStringW flags = GetWord(dbv.pwszVal, 1);

-		CMStringW network = GetWord(dbv.pwszVal, 2);

-		m_ignoreItems.insert(new CIrcIgnoreItem(mask.c_str(), flags.c_str(), network.c_str()));

+		m_ignoreItems.insert(new CIrcIgnoreItem(mask.c_str(), flags.c_str()));

 		db_free(&dbv);

 	}

 }

@@ -991,7 +987,7 @@ void CIrcProto::RewriteIgnoreSettings(void)
 		mir_snprintf(settingName, "IGNORE:%d", i);

 

 		CIrcIgnoreItem &C = m_ignoreItems[i];

-		setWString(settingName, (C.mask + L" " + C.flags + L" " + C.network).c_str());

+		setWString(settingName, (C.mask + L" " + C.flags).c_str());

 	}

 }

 

@@ -1048,20 +1044,16 @@ class CIgnorePrefsDlg : public CIrcBaseDlg
 

 			LVITEM lvItem;

 			lvItem.iItem = m_list.GetItemCount();

-			lvItem.mask = LVIF_TEXT | LVIF_PARAM;

+

 			lvItem.iSubItem = 0;

+			lvItem.mask = LVIF_TEXT | LVIF_PARAM;

 			lvItem.lParam = lvItem.iItem;

 			lvItem.pszText = (wchar_t *)C->mask.c_str();

 			lvItem.iItem = m_list.InsertItem(&lvItem);

 

-			lvItem.mask = LVIF_TEXT;

 			lvItem.iSubItem = 1;

-			lvItem.pszText = (wchar_t *)C->flags.c_str();

-			m_list.SetItem(&lvItem);

-

 			lvItem.mask = LVIF_TEXT;

-			lvItem.iSubItem = 2;

-			lvItem.pszText = (wchar_t *)C->network.c_str();

+			lvItem.pszText = (wchar_t *)C->flags.c_str();

 			m_list.SetItem(&lvItem);

 		}

 

@@ -1129,23 +1121,19 @@ public:
 		m_ignoreChannel.Enable(m_proto->m_ignore);

 		m_add.Enable(m_proto->m_ignore);

 

-		static int COLUMNS_SIZES[3] = { 195, 60, 80 };

 		LV_COLUMN lvC;

 		lvC.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;

 		lvC.fmt = LVCFMT_LEFT;

-		for (int index = 0; index < 3; index++) {

-			lvC.iSubItem = index;

-			lvC.cx = COLUMNS_SIZES[index];

-

-			wchar_t *text = nullptr;

-			switch (index) {

-			case 0: text = TranslateT("Ignore mask"); break;

-			case 1: text = TranslateT("Flags"); break;

-			case 2: text = TranslateT("Network"); break;

-			}

-			lvC.pszText = text;

-			ListView_InsertColumn(GetDlgItem(m_hwnd, IDC_INFO_LISTVIEW), index, &lvC);

-		}

+

+		lvC.iSubItem = 0;

+		lvC.cx = 235;

+		lvC.pszText = TranslateT("Ignore mask");

+		ListView_InsertColumn(GetDlgItem(m_hwnd, IDC_INFO_LISTVIEW), 0, &lvC);

+

+		lvC.iSubItem = 1;

+		lvC.cx = 100;

+		lvC.pszText = TranslateT("Flags");

+		ListView_InsertColumn(GetDlgItem(m_hwnd, IDC_INFO_LISTVIEW), 1, &lvC);

 

 		ListView_SetExtendedListViewStyle(GetDlgItem(m_hwnd, IDC_INFO_LISTVIEW), LVS_EX_FULLROWSELECT);

 		RebuildList();

@@ -1170,11 +1158,10 @@ public:
 

 		int i = m_list.GetItemCount();

 		for (int j = 0; j < i; j++) {

-			wchar_t szMask[512], szFlags[40], szNetwork[100];

+			wchar_t szMask[512], szFlags[40];

 			m_list.GetItemText(j, 0, szMask, _countof(szMask));

 			m_list.GetItemText(j, 1, szFlags, _countof(szFlags));

-			m_list.GetItemText(j, 2, szNetwork, _countof(szNetwork));

-			m_proto->m_ignoreItems.insert(new CIrcIgnoreItem(szMask, szFlags, szNetwork));

+			m_proto->m_ignoreItems.insert(new CIrcIgnoreItem(szMask, szFlags));

 		}

 

 		m_proto->RewriteIgnoreSettings();

@@ -1258,7 +1245,6 @@ public:
 		}

 

 		SetDlgItemText(hWnd, IDC_MASK, szMask);

-		SetDlgItemText(hWnd, IDC_NETWORK, szNetwork);

 		m_add.Disable();

 		m_edit.Disable();

 		m_del.Disable();

diff --git a/protocols/IRCG/src/resource.h b/protocols/IRCG/src/resource.h
index 913211493f..a57abd37e5 100644
--- a/protocols/IRCG/src/resource.h
+++ b/protocols/IRCG/src/resource.h
@@ -143,7 +143,6 @@
 #define IDC_I                           1208

 #define IDC_C                           1209

 #define IDC_D                           1210

-#define IDC_NETWORK                     1211

 #define IDC_IGNORECHANNEL               1212

 #define IDC_ENABLEIGNORE                1213

 #define IDC_IGNOREFILE                  1214