summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-11-23 20:23:23 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-11-23 20:23:23 +0000
commita7ca60f2c217eb28aeb0caac5a9240600ffc57e8 (patch)
tree702ead75ed5143316b0117bdafec478060fca989
parentb37aadb6fb078912dbf417fc166b1aeeabd1b249 (diff)
-Atavism in TabSRMM removed (fixes #1098)
git-svn-id: http://svn.miranda-ng.org/main/trunk@15763 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/TabSRMM/res/chat.rc1
-rw-r--r--plugins/TabSRMM/src/chat/chat_resource.h1
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp1
3 files changed, 0 insertions, 3 deletions
diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 6e74c7eb00..c4c459b3a8 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -101,7 +101,6 @@ BEGIN
CONTROL "",IDC_CHECKBOXES,"SysTreeView32",TVS_HASBUTTONS | TVS_DISABLEDRAGDROP | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,9,286,192
LTEXT "Add new rooms to group:",IDC_STATIC_ADD,10,209,133,10
EDITTEXT IDC_GROUP,152,208,142,14,ES_AUTOHSCROLL
- LTEXT "Chat integration is disabled. You can enable it here, and then you to NEED RESTART Miranda after making this change.\n\nYou MUST disable the standard chat plugin when you enable the group chat support here. Otherwise no group chat at all may work.",IDC_STATIC_MESSAGE,21,52,256,74
END
IDD_OPTIONS2 DIALOGEX 0, 0, 306, 189
diff --git a/plugins/TabSRMM/src/chat/chat_resource.h b/plugins/TabSRMM/src/chat/chat_resource.h
index 3be170399d..4ae21e844e 100644
--- a/plugins/TabSRMM/src/chat/chat_resource.h
+++ b/plugins/TabSRMM/src/chat/chat_resource.h
@@ -54,7 +54,6 @@
#define IDC_STATIC_ADD 1077
#define IDC_STATIC_ULIST 1078
#define IDC_STATIC_OTHER 1079
-#define IDC_STATIC_MESSAGE 1081
#define IDC_STATIC110 1082
#define IDC_STATIC112 1085
#define IDC_TRAYONLYFORINACTIVE 1086
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 9adb9f46dc..4e0828817a 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -412,7 +412,6 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
InitSetting(pszGroup, "AddToGroup", _T("Chat rooms"));
SetDlgItemText(hwndDlg, IDC_GROUP, pszGroup);
mir_free(pszGroup);
- Utils::showDlgControl(hwndDlg, IDC_STATIC_MESSAGE, SW_HIDE);
}
break;