modified: main.cpp

	modified:   options.cpp
	modified:   utilities.cpp
	modified:   utilities.h

1 files changed, 40 insertions, 40 deletions

diff --git a/main.cpp b/main.cpp
index 783ba52..180bbae 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,43 +1,43 @@
-// Copyright © 2010 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-
-
-#include "commonheaders.h"
-
-int gpg_init()
-{
-	setlocale (LC_ALL, "");
-	gpgme_check_version (NULL);
+// Copyright © 2010 sss

+// 

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

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

+// as published by the Free Software Foundation; either version 2

+// of the License, or (at your option) any later version.

+// 

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+

+

+

+

+#include "commonheaders.h"

+

+int gpg_init()

+{

+/*	setlocale (LC_ALL, "");

+	gpgme_check_version (NULL);

 	gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));

 #ifdef LC_MESSAGES

 	gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));

-#endif
-	gpgme_error_t err;
-	gpgme_ctx_t ctx;
-	err = gpgme_new(&ctx);
-	TCHAR error[128];
-	mir_sntprintf(error, 128, _T("%d"), error);
-//	MessageBox(0, error, _T("info"), MB_OK);
-/*	gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
-	char *tmp = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("")));
-	char *tmp2 = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")));
-	gpgme_ctx_set_engine_info(ctx, proto, tmp, tmp2);
-	mir_free(tmp);
-	mir_free(tmp2); */
-	return 0;
-}
+#endif

+	gpgme_error_t err;

+	gpgme_ctx_t ctx;

+	err = gpgme_new(&ctx);

+	TCHAR error[128];

+	mir_sntprintf(error, 128, _T("%d"), error);

+	MessageBox(0, error, _T("info"), MB_OK);

+	gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;

+	char *tmp = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("")));

+	char *tmp2 = mir_t2a(UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")));

+	gpgme_ctx_set_engine_info(ctx, proto, tmp, tmp2);

+	mir_free(tmp);

+	mir_free(tmp2); */

+	return 0;

+}