summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.cpp30
-rw-r--r--messages.cpp2
-rw-r--r--new_gpg.rc8
-rw-r--r--options.cpp2
4 files changed, 20 insertions, 22 deletions
diff --git a/main.cpp b/main.cpp
index 97bf301..5becf47 100644
--- a/main.cpp
+++ b/main.cpp
@@ -377,18 +377,18 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
{
if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
{
- if(hdr->hdr.code == LVN_ITEMCHANGED)
+ if(hdr->hdr.code == NM_CLICK)
{
EnableWindow(GetDlgItem(hwndDlg, ID_OK), 1);
itemnum = hdr->iItem;
}
}
- switch (((LPNMHDR)lParam)->code)
- {
- default:
- break;
+// switch (((LPNMHDR)lParam)->code)
+ // {
+// default:
+// break;
- }
+// }
}
break;
case WM_CLOSE:
@@ -494,11 +494,11 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
case WM_NOTIFY:
{
- switch (((LPNMHDR)lParam)->code)
+/* switch (((LPNMHDR)lParam)->code)
{
default:
break;
- }
+ }*/
}
break;
case WM_CLOSE:
@@ -568,11 +568,11 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
case WM_NOTIFY:
{
- switch (((LPNMHDR)lParam)->code)
+/* switch (((LPNMHDR)lParam)->code)
{
default:
break;
- }
+ }*/
}
break;
case WM_CLOSE:
@@ -864,11 +864,11 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
case WM_NOTIFY:
{
- switch (((LPNMHDR)lParam)->code)
+/* switch (((LPNMHDR)lParam)->code)
{
default:
break;
- }
+ } */
}
break;
case WM_CLOSE:
@@ -1058,7 +1058,7 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
{
if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
{
- if(hdr->hdr.code == LVN_ITEMCHANGED)
+ if(hdr->hdr.code == NM_CLICK)
{
EnableWindow(GetDlgItem(hwndDlg, IDOK), 1);
itemnum2 = hdr->iItem;
@@ -1150,11 +1150,11 @@ static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wPara
case WM_NOTIFY:
{
- switch (((LPNMHDR)lParam)->code)
+/* switch (((LPNMHDR)lParam)->code)
{
default:
break;
- }
+ } */
}
break;
case WM_CLOSE:
diff --git a/messages.cpp b/messages.cpp
index a97e433..394fcc3 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -485,13 +485,11 @@ int SendMsgSvc(WPARAM w, LPARAM l)
debuglog<<"info: Failed to encrypt message with GPG";
return CallService(MS_PROTO_CHAINRECV, w, (LPARAM)ccs);
}
-// mir_free((void**)ccs->lParam);
ccs->lParam = (LPARAM)mir_utf8encodeW(str.c_str());
if(bAppendTags)
DBWriteContactSettingByte(hContact, szGPGModuleName, "MsgsForTagging", DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "MsgsForTagging", 0) + 1);
}
}
-// ccs->wParam&=~PREF_UNICODE; //memory leak ?
return CallService(MS_PROTO_CHAINSEND, w, l);
}
diff --git a/new_gpg.rc b/new_gpg.rc
index 34a8e42..4925e14 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -260,8 +260,8 @@ IDI_UNSECURED ICON "icons\\unsecured.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,0,7
- PRODUCTVERSION 0,8,0,1
+ FILEVERSION 0,0,0,8
+ PRODUCTVERSION 0,9,0,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -277,12 +277,12 @@ BEGIN
BLOCK "041904b0"
BEGIN
VALUE "FileDescription", "new_gpg"
- VALUE "FileVersion", "0, 0, 0, 7"
+ VALUE "FileVersion", "0, 0, 0, 8"
VALUE "InternalName", "new_gpg"
VALUE "LegalCopyright", "Copyright (C) 2010 sss"
VALUE "OriginalFilename", "new_gpg"
VALUE "ProductName", "new_gpg"
- VALUE "ProductVersion", "0, 8, 0, 1"
+ VALUE "ProductVersion", "0, 9, 0, 1"
END
END
BLOCK "VarFileInfo"
diff --git a/options.cpp b/options.cpp
index 4412ea7..304fa13 100644
--- a/options.cpp
+++ b/options.cpp
@@ -366,7 +366,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
{
if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
{
- if(hdr->hdr.code == LVN_ITEMCHANGED)
+ if(hdr->hdr.code == NM_CLICK)
{
void setClistIcon(HANDLE hContact);
void setSrmmIcon(HANDLE hContact);