modified: src/icons.cpp

	modified:   src/init.cpp
	modified:   src/main.cpp
	modified:   src/options.cpp
	modified:   src/utilities.cpp

1 files changed, 47 insertions, 107 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0908fc9..b38d57c 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -238,30 +238,23 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  }
 				  else
 				  {
-					  char setting[64];
-					  PROTOACCOUNT *acc = (PROTOACCOUNT*)CallService(MS_PROTO_GETCONTACTBASEPROTO, 0, (LPARAM)buf);
-					  std::string acc_str;
-					  if(acc)
-					  {
-						  acc_str = toUTF8(acc->tszAccountName);
-						  acc_str += "(";
-						  acc_str += acc->szModuleName;
-						  acc_str += ")" ;
-						  acc_str += "_GPGPubKey";
-						  DBWriteContactSettingString(NULL, szGPGModuleName, acc_str.c_str(), out.c_str());
-						  acc_str = toUTF8(acc->tszAccountName);
-						  acc_str += "(";
-						  acc_str += acc->szModuleName;
-						  acc_str += ")" ;
-						  acc_str += "_KeyMainName";
-						  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), name);
-						  acc_str = toUTF8(acc->tszAccountName);
-						  acc_str += "(";
-						  acc_str += acc->szModuleName;
-						  acc_str += ")" ;
-						  acc_str += "_KeyID";
-						  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), fp);
-					  }
+					  std::string acc_str = buf;
+					  acc_str += "_GPGPubKey";
+					  DBWriteContactSettingString(NULL, szGPGModuleName, acc_str.c_str(), out.c_str());
+					  acc_str = buf;
+					  acc_str += "_KeyMainName";
+					  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), name);
+					  acc_str = buf;
+					  acc_str += "_KeyID";
+					  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), fp);
+				  }
+				  if(!strcmp(buf, Translate("Default")))
+				  {
+					  wstring keyinfo = TranslateT("Default private key id");
+					  keyinfo += _T(": ");
+					  keyinfo += (fp[0])?fp:_T("not set");
+					  extern HWND hwndCurKey_p;
+					  SetWindowText(hwndCurKey_p, keyinfo.c_str());
 				  }
 			  }
 			  TCHAR passwd[64];
@@ -275,13 +268,6 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				  dbsetting += "_Password";
 				  DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), passwd);
 			  }
-			  {
-				  wstring keyinfo = TranslateT("Default private key id");
-				  keyinfo += _T(": ");
-				  keyinfo += (fp[0])?fp:_T("not set");
-				  extern HWND hwndCurKey_p;
-				  SetWindowText(hwndCurKey_p, keyinfo.c_str());
-			  }
 			  delete [] name;
 		  }
 		  bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");
@@ -445,48 +431,24 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 			  }
 			  else
 			  {
-				  char setting[64];
-				  PROTOACCOUNT *acc = (PROTOACCOUNT*)CallService(MS_PROTO_GETCONTACTBASEPROTO, 0, (LPARAM)buf);
-				  std::string acc_str;
-				  if(acc)
-				  {
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_GPGPubKey";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_KeyMainName";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_KeyID";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_KeyComment";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_KeyMainEmail";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-					  acc_str = toUTF8(acc->tszAccountName);
-					  acc_str += "(";
-					  acc_str += acc->szModuleName;
-					  acc_str += ")" ;
-					  acc_str += "_KeyType";
-					  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
-				  }
+				  std::string acc_str = buf;
+				  acc_str += "_GPGPubKey";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
+				  acc_str = buf;
+				  acc_str += "_KeyMainName";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
+				  acc_str = buf;
+				  acc_str += "_KeyID";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
+				  acc_str = buf;
+				  acc_str += "_KeyComment";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
+				  acc_str = buf;
+				  acc_str += "_KeyMainEmail";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
+				  acc_str = buf;
+				  acc_str += "_KeyType";
+				  DBDeleteContactSetting(NULL, szGPGModuleName, acc_str.c_str());
 			  }
 		  }
 		  ListView_DeleteItem(hwndList, itemnum);
@@ -601,24 +563,12 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 					  }
 					  else
 					  {
-						  char setting[64];
-						  PROTOACCOUNT *acc = (PROTOACCOUNT*)CallService(MS_PROTO_GETCONTACTBASEPROTO, 0, (LPARAM)buf);
-						  std::string acc_str;
-						  if(acc)
-						  {
-							  acc_str = toUTF8(acc->tszAccountName);
-							  acc_str += "(";
-							  acc_str += acc->szModuleName;
-							  acc_str += ")" ;
-							  acc_str += "_GPGPubKey";
-							  DBWriteContactSettingString(NULL, szGPGModuleName, acc_str.c_str(), out.c_str());
-							  acc_str = toUTF8(acc->tszAccountName);
-							  acc_str += "(";
-							  acc_str += acc->szModuleName;
-							  acc_str += ")" ;
-							  acc_str += "_KeyID";
-							  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), fp);
-						  }
+						  std::string acc_str = buf;
+						  acc_str += "_GPGPubKey";
+						  DBWriteContactSettingString(NULL, szGPGModuleName, acc_str.c_str(), out.c_str());
+						  acc_str = buf;
+						  acc_str += "_KeyID";
+						  DBWriteContactSettingTString(NULL, szGPGModuleName, acc_str.c_str(), fp);
 					  }
 				  }
 				  extern HWND hwndCurKey_p;
@@ -644,22 +594,12 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				{
 					string keyinfo = Translate("key id");
 					keyinfo += ": ";
-					char setting[64];
-					PROTOACCOUNT *acc = (PROTOACCOUNT*)CallService(MS_PROTO_GETCONTACTBASEPROTO, 0, (LPARAM)buf);
-					std::string acc_str;
-					if(acc)
-					{
-						acc_str = toUTF8(acc->tszAccountName);
-						acc_str += "(";
-						acc_str += acc->szModuleName;
-						acc_str += ")" ;
-						acc_str += "_KeyID";
-						char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, acc_str.c_str(), "");
-						keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
-						mir_free(keyid);
-						SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
-					}
-
+					std::string acc_str= buf;
+					acc_str += "_KeyID";
+					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, acc_str.c_str(), "");
+					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
+					mir_free(keyid);
+					SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
 				}
 			}
 			break;