fixed mem leak in options

added send offline to caps
added option to ignore notifications (via db edit)
remove duplicate zap events (done by new metas internally)

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@339 4f64403b-2f21-0410-a795-97e2b3489a10

4 files changed, 12 insertions, 4 deletions

diff --git a/MySpace/notifications.cpp b/MySpace/notifications.cpp
index 8c2e989..d1f196c 100644
--- a/MySpace/notifications.cpp
+++ b/MySpace/notifications.cpp
@@ -77,6 +77,7 @@ LRESULT CALLBACK NotifyPopupWindowProc( HWND hWnd, UINT message, WPARAM wParam,
 void NotifyMail() {

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndMailPopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyMail", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -114,9 +115,9 @@ void NotifyMail() {
 

 

 void NotifyBlogComment() {

-

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndBlogPopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyBlogComment", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -153,9 +154,9 @@ void NotifyBlogComment() {
 }

 

 void NotifyProfileComment() {

-

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndProfilePopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyProfileComment", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -196,6 +197,7 @@ void NotifyProfileComment() {
 void NotifyFriendRequest() {

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndFriendPopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyFriendRequest", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -274,6 +276,7 @@ void NotifyPictureComment() {
 void NotifyBlogSubscriptPost() {

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndBlogSubPopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyBlogSubscription", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -312,6 +315,7 @@ void NotifyBlogSubscriptPost() {
 void NotifyUnknown(char *name, char *value) {

 	if (!ServiceExists( MS_POPUP_ADDPOPUPT)) return;

 	if(bWndUnknownPopup) return;

+	if(!DBGetContactSettingByte(0, MODULE, "NotifyUnknown", 1)) return;

 

 	POPUPDATAT ppd = {0};

 	TCHAR wproto[256];

@@ -401,9 +405,12 @@ void NotifyZapSend(HANDLE hContact, int zap_num) {
 	dbe.cbBlob = strlen(rmsg) + 1;

 

 	CallService(MS_DB_EVENT_ADD,(WPARAM)hContact,(LPARAM)&dbe);

+	/*

+	// not required for new metas

 	HANDLE hMeta;

 	if(ServiceExists(MS_MC_GETMETACONTACT) && (hMeta = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0)) != 0) // add to metacontact too

 		CallService(MS_DB_EVENT_ADD,(WPARAM)hMeta,(LPARAM)&dbe);

+	*/

 

 	char zap_sound_name[512];

 	mir_snprintf(zap_sound_name, 512, "%s/Zap/%s", MODULE, zap_array[zap_num]);

diff --git a/MySpace/options.cpp b/MySpace/options.cpp
index a12e38e..5b0dae3 100644
--- a/MySpace/options.cpp
+++ b/MySpace/options.cpp
@@ -21,6 +21,7 @@ void LoadOptions() {
 #else

 		_tcsncpy(options.pw, dbv.pszVal, 256);

 #endif

+		DBFreeVariant(&dbv);

 	} else

 	if(!DBGetContactSettingTString(0, MODULE, "pw", &dbv)) { 

 		// remove old cleartext password and convert to encrypted form

diff --git a/MySpace/proto.cpp b/MySpace/proto.cpp
index fdf05b8..7633141 100644
--- a/MySpace/proto.cpp
+++ b/MySpace/proto.cpp
@@ -24,7 +24,7 @@ int GetCaps(WPARAM wParam,LPARAM lParam) {
 			ret = PF2_ONLINE | PF2_SHORTAWAY | PF2_INVISIBLE;

             break;

         case PFLAGNUM_4:

-			ret = PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SUPPORTIDLE | PF4_IMSENDUTF;

+			ret = PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SUPPORTIDLE | PF4_IMSENDUTF | PF4_IMSENDOFFLINE;

             break;

         case PFLAGNUM_5:

 			//ret = PF2_INVISIBLE;

diff --git a/MySpace/version.h b/MySpace/version.h
index 923c5fb..926e37d 100644
--- a/MySpace/version.h
+++ b/MySpace/version.h
@@ -5,7 +5,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				0

 #define __RELEASE_NUM				5

-#define __BUILD_NUM					14

+#define __BUILD_NUM					16

 

 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM