diff options
| -rw-r--r-- | plugins/SpellChecker/src/commons.h | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_opts.cpp | 6 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_opt.cpp | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/plugins/SpellChecker/src/commons.h b/plugins/SpellChecker/src/commons.h index bf6d8740d2..598627fcd2 100644 --- a/plugins/SpellChecker/src/commons.h +++ b/plugins/SpellChecker/src/commons.h @@ -85,7 +85,7 @@ using namespace std; #define FLAGS_DLL_FOLDER _T("%miranda_path%\\Icons")
#define CUSTOM_DICTIONARIES_FOLDER _T("%miranda_userdata%\\Dictionaries")
-#define DICTIONARIES_FOLDER _T("%miranda_path%\\Plugins\\dictionaries")
+#define DICTIONARIES_FOLDER _T("%miranda_path%\\Dictionaries")
// Global Variables
extern HINSTANCE hInst;
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 103811e61e..05a1d8b493 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -195,7 +195,7 @@ static INT_PTR CALLBACK DlgProcIcqPrivacyOpts(HWND hwndDlg, UINT msg, WPARAM wPa ppro = (CIcqProto*)lParam;
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
{
- int nDcType = ppro->getByte("DCType", 2);
+ int nDcType = ppro->getByte("DCType", 0);
int nAddAuth = ppro->getByte("Auth", 1);
if (!ppro->icqOnline()) {
@@ -211,8 +211,8 @@ static INT_PTR CALLBACK DlgProcIcqPrivacyOpts(HWND hwndDlg, UINT msg, WPARAM wPa CheckDlgButton(hwndDlg, IDC_ADD_AUTH, (nAddAuth == 1));
LoadDBCheckState(ppro, hwndDlg, IDC_WEBAWARE, "WebAware", 0);
LoadDBCheckState(ppro, hwndDlg, IDC_PUBLISHPRIMARY, "PublishPrimaryEmail", 0);
- LoadDBCheckState(ppro, hwndDlg, IDC_STATUSMSG_CLIST, "StatusMsgReplyCList", 1);
- LoadDBCheckState(ppro, hwndDlg, IDC_STATUSMSG_VISIBLE, "StatusMsgReplyVisible", 1);
+ LoadDBCheckState(ppro, hwndDlg, IDC_STATUSMSG_CLIST, "StatusMsgReplyCList", 0);
+ LoadDBCheckState(ppro, hwndDlg, IDC_STATUSMSG_VISIBLE, "StatusMsgReplyVisible", 0);
if (!ppro->getByte("StatusMsgReplyCList", 0))
EnableDlgItem(hwndDlg, IDC_STATUSMSG_VISIBLE, FALSE);
}
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index a626d9b0e0..a1978f2c89 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -408,10 +408,10 @@ public: CreateLink(m_txtUsername, "LoginName", _T(""));
CreateLink(m_txtPriority, "Priority", DBVT_WORD, 0, true);
CreateLink(m_chkSavePassword, proto->m_options.SavePassword);
- CreateLink(m_cbResource, "Resource", _T("WatcherPack"));
+ CreateLink(m_cbResource, "Resource", _T("Miranda"));
CreateLink(m_chkUseHostnameAsResource, proto->m_options.HostNameAsResource);
CreateLink(m_chkUseDomainLogin, proto->m_options.UseDomainLogin);
- CreateLink(m_cbServer, "LoginServer", _T("jabber.ru"));
+ CreateLink(m_cbServer, "LoginServer", _T("jabber.org"));
CreateLink(m_txtPort, "Port", DBVT_WORD, 5222);
CreateLink(m_chkUseSsl, proto->m_options.UseSSL);
CreateLink(m_chkUseTls, proto->m_options.UseTLS);
@@ -457,7 +457,7 @@ protected: m_cbServer.AddString(TranslateT("Loading..."));
// fill predefined resources
- TCHAR* szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("WatcherPack") };
+ TCHAR *szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("Miranda") };
for (i=0; i < SIZEOF(szResources); i++)
m_cbResource.AddString(szResources[i]);
@@ -473,7 +473,7 @@ protected: m_cbResource.AddString(tszResource);
m_cbResource.SetText(tszResource);
}
- else m_cbResource.SetText(_T("WatcherPack"));
+ else m_cbResource.SetText(_T("Miranda"));
for (i=0; g_LanguageCodes[i].szCode; i++) {
int iItem = m_cbLocale.AddString(TranslateTS(g_LanguageCodes[i].szDescription), (LPARAM)g_LanguageCodes[i].szCode);
@@ -1599,8 +1599,8 @@ public: {
CreateLink(m_txtUsername, "LoginName", _T(""));
CreateLink(m_chkSavePassword, proto->m_options.SavePassword);
- CreateLink(m_cbResource, "Resource", _T("WatcherPack"));
- CreateLink(m_cbServer, "LoginServer", _T("jabber.ru"));
+ CreateLink(m_cbResource, "Resource", _T("Miranda"));
+ CreateLink(m_cbServer, "LoginServer", _T("jabber.org"));
CreateLink(m_txtPort, "Port", DBVT_WORD, 5222);
CreateLink(m_chkUseDomainLogin, proto->m_options.UseDomainLogin);
@@ -1631,7 +1631,7 @@ protected: m_cbServer.AddString(TranslateT("Loading..."));
// fill predefined resources
- TCHAR* szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("WatcherPack") };
+ TCHAR *szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("Miranda") };
for (int i=0; i < SIZEOF(szResources); i++)
m_cbResource.AddString(szResources[i]);
@@ -1647,7 +1647,7 @@ protected: m_cbResource.AddString(tszResource);
m_cbResource.SetText(tszResource);
}
- else m_cbResource.SetText(_T("WatcherPack"));
+ else m_cbResource.SetText(_T("Miranda"));
m_cbType.AddString(TranslateT("Public XMPP Network"), ACC_PUBLIC);
m_cbType.AddString(TranslateT("Secure XMPP Network"), ACC_TLS);
|