hz ...

1 files changed, 30 insertions, 30 deletions

diff --git a/main.cpp b/main.cpp
index dcb0384..3857f38 100755
--- a/main.cpp
+++ b/main.cpp
@@ -161,10 +161,10 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 					continue;
 				SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_ADDSTRING, 0, (LPARAM)accounts[i]->szModuleName);
 			}
-			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_SELECTSTRING, 0, (LPARAM)Translate("Default"));

-			string keyinfo = Translate("key id");

-			keyinfo += ": ";

-			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

+			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_SELECTSTRING, 0, (LPARAM)Translate("Default"));
+			string keyinfo = Translate("key id");
+			keyinfo += ": ";
+			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
 			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
 			mir_free(keyid);
 			SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
@@ -221,10 +221,10 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  while((s = out.find("\r", s)) != string::npos)
 			  {
 				  out.erase(s, 1);
-			  }

-			  {

-				  char buf[64];

-				  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);

+			  }
+			  {
+				  char buf[64];
+				  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
 				  if(!strcmp(buf, Translate("Default")))
 				  {
 					  DBWriteContactSettingString(NULL, szGPGModuleName, "GPGPubKey", out.c_str());
@@ -411,9 +411,9 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 			  }
 			  if(result == pxNotFound)
 				  break;
-		  }

-		  {

-			  char buf[64];

+		  }
+		  {
+			  char buf[64];
 			  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
 			  if(!strcmp(buf, Translate("Default")))
 			  {
@@ -548,9 +548,9 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  while((s = out.find("\r", s)) != string::npos)
 				  {
 					  out.erase(s, 1);
-				  }

-				  {

-					  char buf[64];

+				  }
+				  {
+					  char buf[64];
 					  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
 					  if(!strcmp(buf, Translate("Default")))
 					  {
@@ -575,27 +575,27 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 		  DestroyWindow(hwndDlg);
 		  break;
 		  		case IDC_ACCOUNT:
-			{

-				char buf[64];

-				GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);

-				if(!strcmp(buf, Translate("Default")))

-				{

-					string keyinfo = Translate("key id");

-					keyinfo += ": ";

-					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");

-					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");

+			{
+				char buf[64];
+				GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
+				if(!strcmp(buf, Translate("Default")))
+				{
+					string keyinfo = Translate("key id");
+					keyinfo += ": ";
+					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
+					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
 					mir_free(keyid);
 					SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
 				}
 				else
 				{
-					string keyinfo = Translate("key id");

-					keyinfo += ": ";

-					char setting[64];

-					strcpy(setting, buf);

-					strcat(setting, "_KeyID");

-					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");

-					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");

+					string keyinfo = Translate("key id");
+					keyinfo += ": ";
+					char setting[64];
+					strcpy(setting, buf);
+					strcat(setting, "_KeyID");
+					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
+					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
 					mir_free(keyid);
 					SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
 				}