diff options
| author | Robert Pösel <robyer@seznam.cz> | 2014-07-09 09:25:44 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2014-07-09 09:25:44 +0000 |
| commit | dd23a58ed2e260044c9e6f5a7585c368dfe425f8 (patch) | |
| tree | 1b15fc82beb1560a00b52019e4146230ef249c99 | |
| parent | 87643a27f1e2b1bdfd30a06f162112908aa6ac17 (diff) | |
SeenPlugin: Don't monitor or show menuitem/userinfo for groupchats
git-svn-id: http://svn.miranda-ng.org/main/trunk@9742 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/SeenPlugin/src/menu.cpp | 2 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/userinfo.cpp | 6 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/utils.cpp | 2 | ||||
| -rw-r--r-- | plugins/SeenPlugin/src/version.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp index 575b232a43..bf8e1e2709 100644 --- a/plugins/SeenPlugin/src/menu.cpp +++ b/plugins/SeenPlugin/src/menu.cpp @@ -41,7 +41,7 @@ int BuildContactMenu(WPARAM wparam,LPARAM) char *szProto = GetContactProto(hContact);
CLISTMENUITEM cmi = { sizeof(cmi) };
- if (!IsWatchedProtocol(szProto) || !db_get_b(NULL,S_MOD,"MenuItem",1))
+ if (!IsWatchedProtocol(szProto) || db_get_b(hContact, szProto, "ChatRoom", false) || !db_get_b(NULL, S_MOD, "MenuItem", 1))
cmi.flags = CMIM_FLAGS | CMIF_HIDDEN | CMIF_TCHAR;
else {
cmi.flags = CMIM_NAME | CMIM_FLAGS | CMIM_ICON | CMIF_TCHAR;
diff --git a/plugins/SeenPlugin/src/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp index 0f8ea6cc91..e27515a8f0 100644 --- a/plugins/SeenPlugin/src/userinfo.cpp +++ b/plugins/SeenPlugin/src/userinfo.cpp @@ -62,8 +62,10 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) int UserinfoInit(WPARAM wparam,LPARAM lparam)
{
- char *proto = GetContactProto((MCONTACT)lparam);
- if ( IsWatchedProtocol(proto)) {
+ MCONTACT hContact = (MCONTACT)lparam;
+ char *szProto = GetContactProto(hContact);
+
+ if (IsWatchedProtocol(szProto) && !db_get_b(hContact, szProto, "ChatRoom", false)) {
OPTIONSDIALOGPAGE uip = { sizeof(uip) };
uip.hInstance = hInstance;
uip.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO);
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index 1d24cb7b8c..7314a1508d 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -617,7 +617,7 @@ int UpdateValues(WPARAM hContact,LPARAM lparam) db_set_b(hContact, S_MOD, "Offline", 0);
}
}
- else if (hContact && IsWatchedProtocol(cws->szModule)) {
+ else if (hContact && IsWatchedProtocol(cws->szModule) && !db_get_b(hContact, cws->szModule, "ChatRoom", false)) {
//here we will come when <User>/<module>/Status is changed or it is idle event and if <module> is watched
if ( CallProtoService(cws->szModule,PS_GETSTATUS,0,0) > ID_STATUS_OFFLINE){
mir_cslock lck(csContacts);
diff --git a/plugins/SeenPlugin/src/version.h b/plugins/SeenPlugin/src/version.h index 1a6a1b82e1..169ceab2a3 100644 --- a/plugins/SeenPlugin/src/version.h +++ b/plugins/SeenPlugin/src/version.h @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __MAJOR_VERSION 5
#define __MINOR_VERSION 0
#define __RELEASE_NUM 4
-#define __BUILD_NUM 8
+#define __BUILD_NUM 9
#include <stdver.h>
|