6 files changed, 11 insertions, 11 deletions

diff --git a/globals.h b/globals.h
index 3aeb8ad..e84ae1e 100755
--- a/globals.h
+++ b/globals.h
@@ -16,7 +16,7 @@
 

 #ifndef GLOBALS_H

 #define GLOBALS_H

-extern bool bAppendTags, bPrescenseSubscription, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;

+extern bool bAppendTags, bPresenceSigning, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;

 extern TCHAR *inopentag, *inclosetag, *outopentag, *outclosetag;

 extern logtofile debuglog;

 #endif

diff --git a/init.cpp b/init.cpp
index 8da20b2..d04c437 100755
--- a/init.cpp
+++ b/init.cpp
@@ -17,7 +17,7 @@
 #include "commonheaders.h"

 

 //global variables

-bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPrescenseSubscription = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false;

+bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPresenceSigning = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false;

 TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL;

 

 list <JabberAccount*> Accounts;

@@ -97,8 +97,8 @@ void init_vars()
 	password = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));

 	debuglog.init();

 	bJabberAPI = DBGetContactSettingByte(NULL, szGPGModuleName, "bJabberAPI", bIsMiranda09?1:0);

-	bPrescenseSubscription = DBGetContactSettingByte(NULL, szGPGModuleName, "bPrescenseSubscription", 1);

-	bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 1);

+	bPresenceSigning = DBGetContactSettingByte(NULL, szGPGModuleName, "bPresenceSigning", 0);

+	bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 0);

 	firstrun_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowX", 0);

 	firstrun_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowY", 0);

 	key_password_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "PasswordWindowX", 0);

diff --git a/main.cpp b/main.cpp
index 9444dd6..cbc36a9 100755
--- a/main.cpp
+++ b/main.cpp
@@ -396,7 +396,7 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 				  }
 				  f<<"Key-Type: RSA";
 				  f<<"\n";
-				  f<<"Key-Length: 2048";
+				  f<<"Key-Length: 4096";
 				  f<<"\n";
 				  f<<"Subkey-Type: RSA";
 				  f<<"\n";
@@ -1078,7 +1078,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("DSA"), 1);
 		SendDlgItemMessage(hwndDlg, IDC_KEY_TYPE, CB_SETCURSEL, (WPARAM)1, 0);
 		SetDlgItemInt(hwndDlg, IDC_KEY_EXPIRE_DATE, 0, 0);
-		SetDlgItemInt(hwndDlg, IDC_KEY_LENGTH, 2048, 0);
+		SetDlgItemInt(hwndDlg, IDC_KEY_LENGTH, 4096, 0);
       return TRUE;
     }
     
diff --git a/new_gpg.rc b/new_gpg.rc
index 4c04666..04cc77e 100755
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -364,7 +364,7 @@ IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 214
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x0

 BEGIN

-    CONTROL         "Turn on prescense subscription (Jabber)",IDC_PRESCENSE_SUBSCRIPTION,

+    CONTROL         "Turn on presence signing (Jabber)",IDC_PRESCENSE_SUBSCRIPTION,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,190,10

 END

 

diff --git a/options.cpp b/options.cpp
index 2b8fce1..c91f30f 100755
--- a/options.cpp
+++ b/options.cpp
@@ -208,7 +208,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		}

 		if(bIsMiranda09)

 			CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1);

-		CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 1);

+		CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 0);

 		CheckStateLoadDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange", 0);

       return TRUE;

     }

@@ -704,7 +704,7 @@ static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
     {

 		extern bool bJabberAPI;

 		TranslateDialogDefault(hwndDlg);

-		CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription", 1);

+		CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning", 0);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI);

 

       return TRUE;

@@ -724,7 +724,7 @@ static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
         

       case PSN_APPLY:

         {

-			bPrescenseSubscription = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription");

+			bPresenceSigning = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning");

           return TRUE;

         }

       }

diff --git a/utilities.cpp b/utilities.cpp
index 56f7ccb..114f2dc 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -716,7 +716,7 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pU
 				return FALSE;
 			}
 		}
-		if(bPrescenseSubscription && nodename)
+		if(bPresenceSigning && nodename)
 		{
 			if(_tcsstr(nodename, _T("status")))
 			{