Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 4 insertions, 2 deletions

diff --git a/utilities.h b/utilities.h
index 5922311..30e9f68 100644..100755
--- a/utilities.h
+++ b/utilities.h
@@ -1,4 +1,4 @@
-// Copyright © 2010 sss

+// Copyright © 2010-2012 sss

 // 

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -27,7 +27,9 @@ void storeOutput(HANDLE ahandle, string *output);
 int ComboBoxAddStringUtf(HWND hCombo, const TCHAR *szString, DWORD data);

 bool isContactSecured(HANDLE hContact);

 bool isContactHaveKey(HANDLE hContact);

-bool isGPGConfigured();

+bool isTabsrmmUsed();

+bool isGPGKeyExist();

+bool isGPGValid();

 const bool StriStr(const char *str, const char *substr);

 string toUTF8(wstring str);

 wstring toUTF16(string str);