diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2014-06-12 17:49:53 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2014-06-12 17:49:53 +0000 |
| commit | 7de38a08b97e0554e318b8c25806cef5d47259e6 (patch) | |
| tree | 2400708e16b437245da88623046e96fb833e23b9 /plugins | |
| parent | 1b88f240b94fc04aa11ef352b720fda741c0ebc6 (diff) | |
headers of not adopted plugins moved to !Deprecated
git-svn-id: http://svn.miranda-ng.org/main/trunk@9438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
87 files changed, 506 insertions, 1069 deletions
diff --git a/plugins/ExternalAPI/delphi/imgdecoder.pas b/plugins/!Deprecated/ExternalAPI/delphi/imgdecoder.pas index eea6ec2610..eea6ec2610 100644 --- a/plugins/ExternalAPI/delphi/imgdecoder.pas +++ b/plugins/!Deprecated/ExternalAPI/delphi/imgdecoder.pas diff --git a/plugins/ExternalAPI/delphi/m_DataAsMessage.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_DataAsMessage.inc index 71bfcc059d..71bfcc059d 100644 --- a/plugins/ExternalAPI/delphi/m_DataAsMessage.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_DataAsMessage.inc diff --git a/plugins/ExternalAPI/delphi/m_anismiley.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_anismiley.inc index f16005fe51..f16005fe51 100644 --- a/plugins/ExternalAPI/delphi/m_anismiley.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_anismiley.inc diff --git a/plugins/ExternalAPI/delphi/m_autoreplacer.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_autoreplacer.inc index bc1d528463..bc1d528463 100644 --- a/plugins/ExternalAPI/delphi/m_autoreplacer.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_autoreplacer.inc diff --git a/plugins/ExternalAPI/delphi/m_contactdir.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_contactdir.inc index 1b21717753..1b21717753 100644 --- a/plugins/ExternalAPI/delphi/m_contactdir.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_contactdir.inc diff --git a/plugins/ExternalAPI/delphi/m_db3xsa.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_db3xsa.inc index 77ac666967..77ac666967 100644 --- a/plugins/ExternalAPI/delphi/m_db3xsa.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_db3xsa.inc diff --git a/plugins/ExternalAPI/delphi/m_ersatz.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_ersatz.inc index 553194eee2..553194eee2 100644 --- a/plugins/ExternalAPI/delphi/m_ersatz.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_ersatz.inc diff --git a/plugins/ExternalAPI/delphi/m_fuse.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_fuse.inc index 82b002b5db..82b002b5db 100644 --- a/plugins/ExternalAPI/delphi/m_fuse.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_fuse.inc diff --git a/plugins/ExternalAPI/delphi/m_help(plugin).inc b/plugins/!Deprecated/ExternalAPI/delphi/m_help(plugin).inc index 0eb63615d9..0eb63615d9 100644 --- a/plugins/ExternalAPI/delphi/m_help(plugin).inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_help(plugin).inc diff --git a/plugins/ExternalAPI/delphi/m_historyevents.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_historyevents.inc index ae582f0eef..ae582f0eef 100644 --- a/plugins/ExternalAPI/delphi/m_historyevents.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_historyevents.inc diff --git a/plugins/ExternalAPI/delphi/m_ircscript.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_ircscript.inc index 0157443e30..0157443e30 100644 --- a/plugins/ExternalAPI/delphi/m_ircscript.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_ircscript.inc diff --git a/plugins/ExternalAPI/delphi/m_keybindings.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_keybindings.inc index e0c31c31e5..e0c31c31e5 100644 --- a/plugins/ExternalAPI/delphi/m_keybindings.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_keybindings.inc diff --git a/plugins/ExternalAPI/delphi/m_langman.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_langman.inc index 4f0079719d..4f0079719d 100644 --- a/plugins/ExternalAPI/delphi/m_langman.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_langman.inc diff --git a/plugins/ExternalAPI/delphi/m_mathmodule.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_mathmodule.inc index a4d10edfa6..a4d10edfa6 100644 --- a/plugins/ExternalAPI/delphi/m_mathmodule.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_mathmodule.inc diff --git a/plugins/ExternalAPI/delphi/m_motd.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_motd.inc index 3b986bf02e..3b986bf02e 100644 --- a/plugins/ExternalAPI/delphi/m_motd.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_motd.inc diff --git a/plugins/ExternalAPI/delphi/m_nickhistory.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_nickhistory.inc index 240fc73b29..240fc73b29 100644 --- a/plugins/ExternalAPI/delphi/m_nickhistory.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_nickhistory.inc diff --git a/plugins/ExternalAPI/delphi/m_simpleaway.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_simpleaway.inc index 16bf2328fb..16bf2328fb 100644 --- a/plugins/ExternalAPI/delphi/m_simpleaway.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_simpleaway.inc diff --git a/plugins/ExternalAPI/delphi/m_smh.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_smh.inc index 134b2075e8..134b2075e8 100644 --- a/plugins/ExternalAPI/delphi/m_smh.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_smh.inc diff --git a/plugins/ExternalAPI/delphi/m_smr.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_smr.inc index d8feacfc6a..d8feacfc6a 100644 --- a/plugins/ExternalAPI/delphi/m_smr.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_smr.inc diff --git a/plugins/ExternalAPI/delphi/m_snapping_windows.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_snapping_windows.inc index e3c513482a..e3c513482a 100644 --- a/plugins/ExternalAPI/delphi/m_snapping_windows.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_snapping_windows.inc diff --git a/plugins/ExternalAPI/delphi/m_spamfilter.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_spamfilter.inc index 54c4729a81..54c4729a81 100644 --- a/plugins/ExternalAPI/delphi/m_spamfilter.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_spamfilter.inc diff --git a/plugins/ExternalAPI/delphi/m_speak.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_speak.inc index 7badc4e0a4..7badc4e0a4 100644 --- a/plugins/ExternalAPI/delphi/m_speak.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_speak.inc diff --git a/plugins/ExternalAPI/delphi/m_voice.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_voice.inc index 5e97094e34..5e97094e34 100644 --- a/plugins/ExternalAPI/delphi/m_voice.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_voice.inc diff --git a/plugins/ExternalAPI/delphi/m_voiceservice.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_voiceservice.inc index ab5872d8d3..ab5872d8d3 100644 --- a/plugins/ExternalAPI/delphi/m_voiceservice.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_voiceservice.inc diff --git a/plugins/ExternalAPI/delphi/m_w7ui.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_w7ui.inc index 3841319ac7..3841319ac7 100644 --- a/plugins/ExternalAPI/delphi/m_w7ui.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_w7ui.inc diff --git a/plugins/ExternalAPI/delphi/m_webcam.inc b/plugins/!Deprecated/ExternalAPI/delphi/m_webcam.inc index 592e28a479..592e28a479 100644 --- a/plugins/ExternalAPI/delphi/m_webcam.inc +++ b/plugins/!Deprecated/ExternalAPI/delphi/m_webcam.inc diff --git a/plugins/ExternalAPI/m_ContactSettings.h b/plugins/!Deprecated/ExternalAPI/m_ContactSettings.h index 1b497ab479..1b497ab479 100644 --- a/plugins/ExternalAPI/m_ContactSettings.h +++ b/plugins/!Deprecated/ExternalAPI/m_ContactSettings.h diff --git a/plugins/ExternalAPI/m_DataAsMessage.h b/plugins/!Deprecated/ExternalAPI/m_DataAsMessage.h index 2f1f2eb441..2f1f2eb441 100644 --- a/plugins/ExternalAPI/m_DataAsMessage.h +++ b/plugins/!Deprecated/ExternalAPI/m_DataAsMessage.h diff --git a/plugins/ExternalAPI/m_LogService.h b/plugins/!Deprecated/ExternalAPI/m_LogService.h index 3acd6be1d6..3acd6be1d6 100644 --- a/plugins/ExternalAPI/m_LogService.h +++ b/plugins/!Deprecated/ExternalAPI/m_LogService.h diff --git a/plugins/ExternalAPI/m_MagneticWindows.h b/plugins/!Deprecated/ExternalAPI/m_MagneticWindows.h index e011c773fd..e011c773fd 100644 --- a/plugins/ExternalAPI/m_MagneticWindows.h +++ b/plugins/!Deprecated/ExternalAPI/m_MagneticWindows.h diff --git a/plugins/ExternalAPI/m_MathModule.h b/plugins/!Deprecated/ExternalAPI/m_MathModule.h index 04ae06a7f7..04ae06a7f7 100644 --- a/plugins/ExternalAPI/m_MathModule.h +++ b/plugins/!Deprecated/ExternalAPI/m_MathModule.h diff --git a/plugins/ExternalAPI/m_autoreplacer.h b/plugins/!Deprecated/ExternalAPI/m_autoreplacer.h index a169edb10c..a169edb10c 100644 --- a/plugins/ExternalAPI/m_autoreplacer.h +++ b/plugins/!Deprecated/ExternalAPI/m_autoreplacer.h diff --git a/plugins/ExternalAPI/m_db3xsa.h b/plugins/!Deprecated/ExternalAPI/m_db3xsa.h index f1e5334fc4..f1e5334fc4 100644 --- a/plugins/ExternalAPI/m_db3xsa.h +++ b/plugins/!Deprecated/ExternalAPI/m_db3xsa.h diff --git a/plugins/ExternalAPI/m_dbx_tree.h b/plugins/!Deprecated/ExternalAPI/m_dbx_tree.h index 073f56043b..073f56043b 100644 --- a/plugins/ExternalAPI/m_dbx_tree.h +++ b/plugins/!Deprecated/ExternalAPI/m_dbx_tree.h diff --git a/plugins/ExternalAPI/m_fortunemsg.h b/plugins/!Deprecated/ExternalAPI/m_fortunemsg.h index bf13dc422c..bf13dc422c 100644 --- a/plugins/ExternalAPI/m_fortunemsg.h +++ b/plugins/!Deprecated/ExternalAPI/m_fortunemsg.h diff --git a/plugins/ExternalAPI/m_hddinfo.h b/plugins/!Deprecated/ExternalAPI/m_hddinfo.h index 3f529ec1ff..3f529ec1ff 100644 --- a/plugins/ExternalAPI/m_hddinfo.h +++ b/plugins/!Deprecated/ExternalAPI/m_hddinfo.h diff --git a/plugins/ExternalAPI/m_help.h b/plugins/!Deprecated/ExternalAPI/m_help.h index ea8557628c..ea8557628c 100644 --- a/plugins/ExternalAPI/m_help.h +++ b/plugins/!Deprecated/ExternalAPI/m_help.h diff --git a/plugins/ExternalAPI/m_icqplus.h b/plugins/!Deprecated/ExternalAPI/m_icqplus.h index 30c5b44a82..30c5b44a82 100755..100644 --- a/plugins/ExternalAPI/m_icqplus.h +++ b/plugins/!Deprecated/ExternalAPI/m_icqplus.h diff --git a/plugins/ExternalAPI/m_ircscript.h b/plugins/!Deprecated/ExternalAPI/m_ircscript.h index ddab3b96bb..ddab3b96bb 100644 --- a/plugins/ExternalAPI/m_ircscript.h +++ b/plugins/!Deprecated/ExternalAPI/m_ircscript.h diff --git a/plugins/ExternalAPI/m_langman.h b/plugins/!Deprecated/ExternalAPI/m_langman.h index 1a7b5bf9c2..1a7b5bf9c2 100644 --- a/plugins/ExternalAPI/m_langman.h +++ b/plugins/!Deprecated/ExternalAPI/m_langman.h diff --git a/plugins/ExternalAPI/m_script.h b/plugins/!Deprecated/ExternalAPI/m_script.h index 2388bbaad1..2388bbaad1 100644 --- a/plugins/ExternalAPI/m_script.h +++ b/plugins/!Deprecated/ExternalAPI/m_script.h diff --git a/plugins/ExternalAPI/m_simpleaway.h b/plugins/!Deprecated/ExternalAPI/m_simpleaway.h index e70dcbf4ac..e70dcbf4ac 100644 --- a/plugins/ExternalAPI/m_simpleaway.h +++ b/plugins/!Deprecated/ExternalAPI/m_simpleaway.h diff --git a/plugins/ExternalAPI/m_snappingwindows.h b/plugins/!Deprecated/ExternalAPI/m_snappingwindows.h index fcfd679913..fcfd679913 100644 --- a/plugins/ExternalAPI/m_snappingwindows.h +++ b/plugins/!Deprecated/ExternalAPI/m_snappingwindows.h diff --git a/plugins/ExternalAPI/m_voice.h b/plugins/!Deprecated/ExternalAPI/m_voice.h index 5adf159f05..5adf159f05 100644 --- a/plugins/ExternalAPI/m_voice.h +++ b/plugins/!Deprecated/ExternalAPI/m_voice.h diff --git a/plugins/ExternalAPI/m_voiceservice.h b/plugins/!Deprecated/ExternalAPI/m_voiceservice.h index 98c3580aea..98c3580aea 100644 --- a/plugins/ExternalAPI/m_voiceservice.h +++ b/plugins/!Deprecated/ExternalAPI/m_voiceservice.h diff --git a/plugins/ExternalAPI/m_w7ui.h b/plugins/!Deprecated/ExternalAPI/m_w7ui.h index 6d8ee28b92..6d8ee28b92 100644 --- a/plugins/ExternalAPI/m_w7ui.h +++ b/plugins/!Deprecated/ExternalAPI/m_w7ui.h diff --git a/plugins/AutoShutdown/res/resource.rc b/plugins/AutoShutdown/res/resource.rc index 222c63cecb..6739278fdc 100644 --- a/plugins/AutoShutdown/res/resource.rc +++ b/plugins/AutoShutdown/res/resource.rc @@ -71,8 +71,6 @@ BEGIN LTEXT "Automatically shutdown the computer and turn the power off when one of the following occurs:",IDC_STATIC,12,128,273,18,SS_NOPREFIX
CONTROL "&Thunderstorm warning is issued (Weather)",IDC_CHECK_WEATHER,
"Button",BS_AUTOCHECKBOX | BS_TOP | WS_DISABLED | WS_TABSTOP,12,150,273,11
- CONTROL "&Harddrive overheats (HDD Info)",IDC_CHECK_HDDOVERHEAT,
- "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,163,273,10
END
IDD_SETTINGS DIALOGEX 0, 0, 239, 286
diff --git a/plugins/AutoShutdown/src/common.h b/plugins/AutoShutdown/src/common.h index 7a59d8961f..e2cd8a8264 100644 --- a/plugins/AutoShutdown/src/common.h +++ b/plugins/AutoShutdown/src/common.h @@ -59,11 +59,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_hotkeys.h>
#include <m_weather.h>
-#include <m_hddinfo.h>
#include <m_toptoolbar.h>
-#include <m_autoreplacer.h>
-#include <m_snappingwindows.h>
-#include "m_shutdown.h"
+#include <m_shutdown.h>
#include "cpuusage.h"
#include "frame.h"
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index 4cadbe61c4..fbd8da2d41 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -50,10 +50,6 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L {
BOOL enabled = ServiceIsTypeEnabled(SDSDT_SHUTDOWN,0);
if (enabled) {
- if (ServiceExists(MS_SYSINFO_HDDTEMP)) {
- EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_HDDOVERHEAT),TRUE);
- CheckDlgButton(hwndDlg,IDC_CHECK_HDDOVERHEAT,db_get_b(NULL,"AutoShutdown","HddOverheatShutdown",SETTING_HDDOVERHEATSHUTDOWN_DEFAULT) != 0);
- }
if (ServiceExists(MS_WEATHER_UPDATE)) {
EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_WEATHER),TRUE);
CheckDlgButton(hwndDlg,IDC_CHECK_WEATHER,db_get_b(NULL,"AutoShutdown","WeatherShutdown",SETTING_WEATHERSHUTDOWN_DEFAULT) != 0);
@@ -100,8 +96,6 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L db_set_b(NULL,"AutoShutdown","SmartOfflineCheck",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SMARTOFFLINECHECK) != 0));
if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_WEATHER)))
db_set_b(NULL,"AutoShutdown","WeatherShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_WEATHER) != 0));
- if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_HDDOVERHEAT)))
- db_set_b(NULL,"AutoShutdown","HddOverheatShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_HDDOVERHEAT) != 0));
return TRUE;
}
break;
diff --git a/plugins/AutoShutdown/src/resource.h b/plugins/AutoShutdown/src/resource.h index f379eb3aab..78a764d908 100644 --- a/plugins/AutoShutdown/src/resource.h +++ b/plugins/AutoShutdown/src/resource.h @@ -43,7 +43,6 @@ #define IDC_CHECK_REMEMBERONRESTART 1033
#define IDC_CHECK_SMARTOFFLINECHECK 1034
#define IDC_CHECK_WEATHER 1035
-#define IDC_CHECK_HDDOVERHEAT 1036
// Next default values for new objects
//
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 1f3fad458e..f18255283a 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -130,8 +130,6 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR SetDlgItemText(hwndDlg,IDC_EDIT_MESSAGE,dbv.ptszVal);
mir_free(dbv.ptszVal);
}
- if (ServiceExists(MS_AUTOREPLACER_ADDWINHANDLE))
- CallService(MS_AUTOREPLACER_ADDWINHANDLE,0,(LPARAM)GetDlgItem(hwndDlg,IDC_EDIT_MESSAGE));
}
/* cpuusage threshold */
{
@@ -181,8 +179,6 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR }
case WM_DESTROY:
{
- if (ServiceExists(MS_AUTOREPLACER_ADDWINHANDLE))
- CallService(MS_AUTOREPLACER_REMWINHANDLE,0,(LPARAM)GetDlgItem(hwndDlg,IDC_EDIT_MESSAGE));
Utils_SaveWindowPosition(hwndDlg,NULL,"AutoShutdown","SettingsDlg_");
HICON hIcon=(HICON)SendDlgItemMessage(hwndDlg,IDC_ICON_HEADER,STM_SETIMAGE,IMAGE_ICON,0);
HFONT hFont=(HFONT)SendDlgItemMessage(hwndDlg,IDC_TEXT_HEADER,WM_GETFONT,0,0);
@@ -395,7 +391,6 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR }
break;
}
- CallSnappingWindowProc(hwndDlg,msg,wParam,lParam); /* Snapping Windows plugin */
return FALSE;
}
diff --git a/plugins/AutoShutdown/src/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp index 70111eaa44..61686744f4 100644 --- a/plugins/AutoShutdown/src/watcher.cpp +++ b/plugins/AutoShutdown/src/watcher.cpp @@ -31,8 +31,6 @@ static HANDLE hHookIdleChanged; static HANDLE hHookSettingChanged;
/* Weather Shutdown */
static HANDLE hHookWeatherUpdated;
-/* Overheat Shutdown */
-static HANDLE hHookHddOverheat;
/* Services */
static HANDLE hServiceStartWatcher,hServiceStopWatcher,hServiceIsEnabled;
static HANDLE hEventWatcherChanged;
@@ -246,15 +244,6 @@ static int WeatherUpdated(WPARAM wParam,LPARAM lParam) return 0;
}
-/************************* Overheat Shutdown **************************/
-
-static int HddOverheat(WPARAM wParam,LPARAM lParam)
-{
- if (db_get_b(NULL,"AutoShutdown","HddOverheatShutdown",SETTING_HDDOVERHEATSHUTDOWN_DEFAULT))
- ServiceShutdown(SDSDT_SHUTDOWN,TRUE);
- return 0;
-}
-
/************************* Services ***********************************/
INT_PTR ServiceStartWatcher(WPARAM wParam,LPARAM lParam)
@@ -329,9 +318,6 @@ void WatcherModulesLoaded(void) /* Weather Shutdown */
if (ServiceExists(MS_WEATHER_UPDATE))
hHookWeatherUpdated=HookEvent(ME_WEATHER_UPDATED,WeatherUpdated);
- /* Overheat Shutdown */
- if (ServiceExists(MS_SYSINFO_HDDTEMP))
- hHookHddOverheat=HookEvent(ME_SYSINFO_HDDOVERHEAT,HddOverheat);
/* restore watcher if it was running on last exit */
if (db_get_b(NULL,"AutoShutdown","RememberOnRestart",0)==SDROR_RUNNING) {
@@ -356,8 +342,6 @@ void InitWatcher(void) hHookProtoAck=HookEvent(ME_PROTO_ACK,ProtoAck);
/* Weather Shutdown */
hHookWeatherUpdated=NULL;
- /* Overheat Shutdown */
- hHookHddOverheat=NULL;
/* Services */
hEventWatcherChanged=CreateHookableEvent(ME_AUTOSHUTDOWN_WATCHERCHANGED);
hServiceStartWatcher = CreateServiceFunction(MS_AUTOSHUTDOWN_STARTWATCHER, ServiceStartWatcher);
@@ -383,8 +367,6 @@ void UninitWatcher(void) mir_free(transfers); /* does NULL check */
/* Weather Shutdown */
UnhookEvent(hHookWeatherUpdated); /* does NULL check */
- /* Overheat Shutdown */
- UnhookEvent(hHookHddOverheat); /* does NULL check */
/* Services */
DestroyServiceFunction(hServiceStartWatcher);
DestroyServiceFunction(hServiceStopWatcher);
diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 2aaa9463b2..55c09e6d4d 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -105,22 +105,6 @@ void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata) CallServiceSync(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0);
break;
- case PCA_OPENLOG: // open log file
- {
- TCString LogFilePath;
- LS_LOGINFO li = {0};
- li.cbSize = sizeof(li);
- li.szID = LOG_ID;
- li.hContact = hContact;
- li.Flags = LSLI_TCHAR;
- li.tszLogPath = LogFilePath.GetBuffer(MAX_PATH);
- if (!CallService(MS_LOGSERVICE_GETLOGINFO, (WPARAM)&li, 0)) {
- LogFilePath.ReleaseBuffer();
- ShowLog(LogFilePath);
- }
- else LogFilePath.ReleaseBuffer();
- break;
- }
case PCA_CLOSEPOPUP: // close popup
PUDeletePopup(hWnd);
break;
@@ -276,50 +260,11 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) ClientName.ReleaseBuffer();
}
else ClientName = sd.MirVer;
-
- if (bVariablesExists)
- logservice_log(LOG_ID, hContact, ClientName);
- else {
- _ASSERT(szProto);
- TCString szUID(_T(""));
- char *uid = (char*)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
- if (uid && (INT_PTR)uid != CALLSERVICE_NOTFOUND)
- szUID = DBGetContactSettingAsString(hContact, szProto, uid, _T(""));
-
- logservice_log(LOG_ID, hContact, TCString((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR)) + _T(" (") + szUID + TranslateT(") changed client to ") + ClientName);
- }
}
_ASSERT(sd.MirVer.GetLen()); // save the last known MirVer value even if the new one is empty
return 0;
}
-static int ContactSettingsInit(WPARAM wParam, LPARAM lParam)
-{
- CONTACTSETTINGSINIT *csi = (CONTACTSETTINGSINIT*)wParam;
- char *szProto = (csi->Type == CSIT_CONTACT) ? GetContactProto(csi->hContact) : NULL;
- if ((csi->Type == CSIT_GROUP) || (szProto && csi->Type == CSIT_CONTACT)) {
- int Flag1 = (csi->Type == CSIT_CONTACT) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) : PF1_IM; // if it's a group settings dialog, we assume that there are possibly some contacts in the group with PF1_IM capability
- if (Flag1 & (PF1_IMRECV | PF1_URLRECV | PF1_FILERECV)) { // I hope, these flags are sufficient to describe which protocols can theoretically have a client
- CONTACTSETTINGSCONTROL csc = {0};
- csc.cbSize = sizeof(csc);
- csc.cbStateSize = sizeof(CSCONTROLSTATE);
- csc.Position = CSPOS_SORTBYALPHABET;
- csc.Flags = CSCF_TCHAR;
- csc.ControlType = CSCT_COMBOBOX;
- csc.ptszTitle = LPGENT("Client change notifications:");
- csc.ptszGroup = CSGROUP_NOTIFICATIONS;
- csc.szModule = MOD_NAME;
- csc.szSetting = DB_CCN_NOTIFY;
- csc.StateNum = 4;
- csc.DefState = 3;
- CSCONTROLSTATE States[] = {CSCONTROLSTATE(LPGENT("Never, ignore client changes for this contact"), (BYTE)NOTIFY_IGNORE), CSCONTROLSTATE(LPGENT("Always except when client change notifications are disabled globally"), (BYTE)NOTIFY_ALMOST_ALWAYS), CSCONTROLSTATE(LPGENT("Always, even when client change notifications are disabled globally"), (BYTE)NOTIFY_ALWAYS), CSCONTROLSTATE(LPGENT("Use global settings (default)"), (BYTE)NOTIFY_USEGLOBAL)};
- csc.pStates = States;
- CallService(MS_CONTACTSETTINGS_ADDCONTROL, wParam, (LPARAM)&csc);
- }
- }
- return 0;
-}
-
static INT_PTR srvTogglePopups(WPARAM wParam, LPARAM lParam)
{
g_PopupOptPage.SetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY, !g_PopupOptPage.GetDBValueCopy(IDC_POPUPOPTDLG_POPUPNOTIFY));
@@ -385,7 +330,6 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_SYSTEM_MODULELOAD, ModuleLoad);
HookEvent(ME_SYSTEM_MODULEUNLOAD, ModuleLoad);
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ContactSettingChanged);
- HookEvent(ME_CONTACTSETTINGS_INITIALISE, ContactSettingsInit);
SkinAddNewSoundEx(CLIENTCHANGED_SOUND, NULL, LPGEN("ClientChangeNotify: Client changed"));
if (bPopupExists) {
@@ -408,7 +352,6 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) if (!bFingerprintExists && !db_get_b(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 0))
CreateDialog(g_hInstance, MAKEINTRESOURCE(IDD_CCN_ERROR), NULL, CCNErrorDlgProc);
- logservice_register(LOG_ID, LPGENT("ClientChangeNotify"), _T("ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,ID)) changed client to %extratext%"));
return 0;
}
diff --git a/plugins/ClientChangeNotify/src/Common.h b/plugins/ClientChangeNotify/src/Common.h index d29080795b..2dbe3efbfd 100644 --- a/plugins/ClientChangeNotify/src/Common.h +++ b/plugins/ClientChangeNotify/src/Common.h @@ -38,7 +38,6 @@ #include "m_langpack.h"
#include "m_options.h"
#include "m_clist.h"
-#include "m_LogService.h"
#include "m_system.h"
#include "m_message.h"
#include "m_userinfo.h"
@@ -51,7 +50,6 @@ #include "m_fingerprint.h"
#include "m_metacontacts.h"
-#include "m_ContactSettings.h"
#include "CommonLibs\TMyArray.h"
#include "CommonLibs\Options.h"
@@ -68,7 +66,6 @@ #define PCA_OPENDETAILS 2 // open contact details window
#define PCA_OPENMENU 3 // open contact menu
#define PCA_OPENHISTORY 4 // open contact history
-#define PCA_OPENLOG 5 // open log file
#define PCA_DONOTHING 6 // do nothing
#define POPUP_DEF_LCLICKACTION PCA_OPENMESSAGEWND
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index 96a96ccc20..711ba11a39 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -78,7 +78,6 @@ PopupActions[] = LPGENT("Open contact details window"), PCA_OPENDETAILS,
LPGENT("Open contact menu"), PCA_OPENMENU,
LPGENT("Open contact history"), PCA_OPENHISTORY,
- LPGENT("Open log file"), PCA_OPENLOG,
LPGENT("Do nothing"), PCA_DONOTHING
};
diff --git a/plugins/ExternalAPI/m_shutdown.h b/plugins/ExternalAPI/m_shutdown.h index 239a728d82..74c32d7830 100644 --- a/plugins/ExternalAPI/m_shutdown.h +++ b/plugins/ExternalAPI/m_shutdown.h @@ -157,7 +157,6 @@ Unused, return always 0 here. #define SETTING_SHOWCONFIRMDLG_DEFAULT 1
#define SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT 30 // seconds
#define SETTING_WEATHERSHUTDOWN_DEFAULT 0
-#define SETTING_HDDOVERHEATSHUTDOWN_DEFAULT 1
#define SETTING_SMARTOFFLINECHECK_DEFAULT 1
#define SETTING_SHUTDOWNTYPE_DEFAULT SDSDT_SHUTDOWN
diff --git a/plugins/ExternalAPI/m_svc_dbepp.h b/plugins/ExternalAPI/m_svc_dbepp.h deleted file mode 100644 index d728de9ddc..0000000000 --- a/plugins/ExternalAPI/m_svc_dbepp.h +++ /dev/null @@ -1,42 +0,0 @@ -/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
-Copyright (c) 2003-11 Bio, Jonathan Gordon
-
-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.
-*/
-
-#ifndef M_DBEDITOR
-#define M_DBEDITOR
-
-/*
-Open user tree in DBE++
-wParam=(HANDLE)hContact
-lParam=0
-always returns 0
-*/
-#define MS_DBEDIT_MENUCOMMAND "DBEditorpp/MenuCommand"
-
-/*
-Import settings\contacts from file
-wParam=(HANDLE)hContact
-lParam=(char*)FilePath
-always returns 0
-*/
-#define MS_DBEDIT_IMPORT "DBEditorpp/Import"
-
-#endif
\ No newline at end of file diff --git a/plugins/IEView/res/ieview.rc b/plugins/IEView/res/ieview.rc index 09852a0d95..6aac7db2ce 100644 --- a/plugins/IEView/res/ieview.rc +++ b/plugins/IEView/res/ieview.rc @@ -7,7 +7,8 @@ //
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "afxres.h"
+
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -70,7 +71,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,46,279,10
CONTROL "Enable workaround for PNG transparency",IDC_ENABLE_PNGHACK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,61,279,10
- CONTROL "Enable MathModule support",IDC_ENABLE_MATHMODULE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,76,279,10
CONTROL "Replace smileys in user names",IDC_SMILEYS_IN_NAMES,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,91,279,10
CONTROL "Hide window border",IDC_NO_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,279,10
@@ -168,7 +168,8 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-
+
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 716cb584f3..8545f34264 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -57,12 +57,6 @@ bool HTMLBuilder::encode(MCONTACT hContact, const char *proto, const wchar_t *te break;
}
level++;
- case 2:
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_MATHMODULE) && Options::isMathModule()) {
- token = TextToken::tokenizeMath(text);
- break;
- }
- level++;
case 3:
token = TextToken::tokenizeLinks(text);
break;
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 7be2656e0d..a6b7ca5ca9 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -477,9 +477,6 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w if (Options::getGeneralFlags() & Options::GENERAL_ENABLE_FLASH) {
CheckDlgButton(hwndDlg, IDC_ENABLE_FLASH, TRUE);
}
- if (Options::getGeneralFlags() & Options::GENERAL_ENABLE_MATHMODULE) {
- CheckDlgButton(hwndDlg, IDC_ENABLE_MATHMODULE, TRUE);
- }
if (Options::getGeneralFlags() & Options::GENERAL_ENABLE_PNGHACK) {
CheckDlgButton(hwndDlg, IDC_ENABLE_PNGHACK, TRUE);
}
@@ -492,7 +489,6 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w if (Options::getGeneralFlags() & Options::GENERAL_ENABLE_EMBED) {
CheckDlgButton(hwndDlg, IDC_ENABLE_EMBED, TRUE);
}
- EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_MATHMODULE), Options::isMathModule());
EnableWindow(GetDlgItem(hwndDlg, IDC_SMILEYS_IN_NAMES), Options::isSmileyAdd());
EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));
TCHAR* size[] = { _T("320 x 205"), _T("480 x 385") , _T("560 x 349"), _T("640 x 390")};
@@ -508,7 +504,6 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w switch (LOWORD(wParam)) {
case IDC_ENABLE_BBCODES:
case IDC_ENABLE_FLASH:
- case IDC_ENABLE_MATHMODULE:
case IDC_ENABLE_PNGHACK:
case IDC_SMILEYS_IN_NAMES:
case IDC_NO_BORDER:
@@ -533,9 +528,6 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_FLASH)) {
i |= Options::GENERAL_ENABLE_FLASH;
}
- if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_MATHMODULE)) {
- i |= Options::GENERAL_ENABLE_MATHMODULE;
- }
if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_PNGHACK)) {
i |= Options::GENERAL_ENABLE_PNGHACK;
}
@@ -964,7 +956,6 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA }
bool Options::isInited = false;
-bool Options::bMathModule = false;
bool Options::bSmileyAdd = false;
int Options::avatarServiceFlags = 0;
int Options::generalFlags;
@@ -1600,7 +1591,6 @@ void Options::init() lastProto = proto;
}
- bMathModule = 0 != ServiceExists(MTH_GET_GIF_UNICODE);
bSmileyAdd = 0 != ServiceExists(MS_SMILEYADD_BATCHPARSE);
avatarServiceFlags = 0;
if (ServiceExists(MS_AV_GETAVATARBITMAP))
@@ -1642,11 +1632,6 @@ int Options::getEmbedsize() return db_get_dw(NULL, ieviewModuleName, "Embedsize", 0);
}
-bool Options::isMathModule()
-{
- return bMathModule;
-}
-
bool Options::isSmileyAdd()
{
return bSmileyAdd;
diff --git a/plugins/IEView/src/Options.h b/plugins/IEView/src/Options.h index 58f758ceaf..4fbf6fe4a1 100644 --- a/plugins/IEView/src/Options.h +++ b/plugins/IEView/src/Options.h @@ -195,7 +195,6 @@ class Options { private:
static int generalFlags;
static bool isInited;
- static bool bMathModule;
static bool bSmileyAdd;
static int avatarServiceFlags;
static ProtocolSettings* protocolList;
@@ -207,7 +206,6 @@ public: };
enum OPTIONS {
GENERAL_ENABLE_BBCODES = 0x000001,
- GENERAL_ENABLE_MATHMODULE = 0x000002,
GENERAL_ENABLE_FLASH = 0x000004,
GENERAL_ENABLE_PNGHACK = 0x000008,
GENERAL_SMILEYINNAMES = 0x000010,
@@ -235,7 +233,6 @@ public: static void setEmbedsize(int size);
static int getEmbedsize();
- static bool isMathModule();
static bool isSmileyAdd();
static int getAvatarServiceFlags();
static void init();
diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp index 7b27e70614..40fb816bde 100644 --- a/plugins/IEView/src/TextToken.cpp +++ b/plugins/IEView/src/TextToken.cpp @@ -127,7 +127,7 @@ void TextToken::setLink(const wchar_t *_link) static int countNoWhitespace(const wchar_t *str)
{
int c;
- for (c=0; *str!='\n' && *str!='\r' && *str!='\t' && *str!=' ' && *str!='\0'; str++, c++);
+ for (c = 0; *str != '\n' && *str != '\r' && *str != '\t' && *str != ' ' && *str != '\0'; str++, c++);
return c;
}
@@ -135,125 +135,38 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text) { return tokenizeBBCodes(text, (int)wcslen(text));
}
-TextToken* TextToken::tokenizeMath(const wchar_t *text) {
- TextToken *firstToken = NULL, *lastToken = NULL, *mathToken = NULL;
- static bool mathModInitialized = false;
- static wchar_t *mathTagName[] = {NULL, NULL};
- static int mathTagLen[] = {0, 0};
- int i;
- if (!mathModInitialized) {
- if (ServiceExists(MATH_GET_PARAMS)) {
- char* mthDelStart = (char *)CallService(MATH_GET_PARAMS, (WPARAM)MATH_PARAM_STARTDELIMITER, 0);
- char* mthDelEnd = (char *)CallService(MATH_GET_PARAMS, (WPARAM)MATH_PARAM_ENDDELIMITER, 0);
- if (mthDelStart!=NULL) {
- mathTagName[0] = mir_a2t(mthDelStart);
- mathTagLen[0] = (int)wcslen(mathTagName[0]);
- }
- if (mthDelEnd!=NULL) {
- mathTagName[1] = mir_a2t(mthDelEnd);
- mathTagLen[1] = (int)wcslen(mathTagName[1]);
- }
- CallService(MTH_FREE_MATH_BUFFER,0, (LPARAM) mthDelStart);
- CallService(MTH_FREE_MATH_BUFFER,0, (LPARAM) mthDelEnd);
- }
- mathModInitialized = true;
- }
- int textLen = 0;
- int l = (int)wcslen(text);
- for (i=0; i<=l;) {
- bool mathFound = false;
- int k = 0, tagDataStart=0, newTokenType = 0, newTokenSize = 0;
- if (mathTagName[0] != NULL && mathTagName[1] != NULL) {
- if (!wcsnicmp(text+i, mathTagName[0], mathTagLen[0])) {
- k = tagDataStart = i + mathTagLen[0];
- for (; k < l; k++) {
- if (!wcsnicmp(text+k, mathTagName[1], mathTagLen[1])) {
- k += mathTagLen[1];
- mathFound = true;
- break;
- }
- }
- }
- }
- if (mathFound) {
- mathToken = new TextToken(MATH, text + tagDataStart, k - mathTagLen[1] - tagDataStart);
- char* mathPath=(char*)CallService(MTH_GET_GIF_UNICODE, 0, (LPARAM) mathToken->getTextW());
- if (mathPath!=NULL) {
- mathToken->setLink(mathPath);
- CallService(MTH_FREE_GIFPATH, 0, (LPARAM) mathPath);
- } else {
- mathToken->setLink("");
- }
- mathToken->setEnd(false);
- newTokenType = MATH;
- newTokenSize = k - i;
- } else {
- if (i==l) {
- newTokenType = END;
- newTokenSize = 1;
- } else {
- newTokenType = TEXT;
- newTokenSize = 1;
- }
- }
- if (newTokenType != TEXT) {
- if (textLen >0 ) {
- TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);
- textLen = 0;
- if (lastToken == NULL) {
- firstToken = newToken;
- } else {
- lastToken->setNext(newToken);
- }
- lastToken = newToken;
- }
- if (newTokenType == MATH) {
- if (lastToken == NULL) {
- firstToken = mathToken;
- } else {
- lastToken->setNext(mathToken);
- }
- lastToken = mathToken;
- }
- } else {
- textLen += newTokenSize;
- }
- i += newTokenSize;
- }
- return firstToken;
-}
// TODO: Add the following BBCodes: code
#define BB_TAG_NUM 10
TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) {
- static const wchar_t *bbTagName[] = {L"b", L"i", L"u", L"s", L"img", L"color", L"size", L"bimg", L"url", L"code"};
- static int bbTagNameLen[] = {1, 1, 1, 1, 3, 5, 4, 4, 3, 4};
- static int bbTagArg[] = {0, 0, 0, 0, 0, 1, 1, 0, 1, 0};
- static int bbTagId[] = {BB_B, BB_I, BB_U, BB_S, BB_IMG, BB_COLOR, BB_SIZE, BB_BIMG, BB_URL, BB_CODE};
+ static const wchar_t *bbTagName[] = { L"b", L"i", L"u", L"s", L"img", L"color", L"size", L"bimg", L"url", L"code" };
+ static int bbTagNameLen[] = { 1, 1, 1, 1, 3, 5, 4, 4, 3, 4 };
+ static int bbTagArg[] = { 0, 0, 0, 0, 0, 1, 1, 0, 1, 0 };
+ static int bbTagId[] = { BB_B, BB_I, BB_U, BB_S, BB_IMG, BB_COLOR, BB_SIZE, BB_BIMG, BB_URL, BB_CODE };
static int bbTagEnd[BB_TAG_NUM];
static int bbTagCount[BB_TAG_NUM];
- int i,j;
- TextToken *firstToken = NULL, *lastToken = NULL, * bbToken = NULL;
+ int i, j;
+ TextToken *firstToken = NULL, *lastToken = NULL, *bbToken = NULL;
int textLen = 0;
for (j = 0; j < BB_TAG_NUM; j++) {
bbTagCount[j] = 0;
bbTagEnd[j] = 0;
}
for (i = 0; i <= l;) {
- int k, tagArgStart=0, tagArgEnd=0, tagDataStart=0, newTokenType = 0, newTokenSize = 0;
+ int k, tagArgStart = 0, tagArgEnd = 0, tagDataStart = 0, newTokenType = 0, newTokenSize = 0;
bool bbFound = false;
if (text[i] == '[') {
- if (text[i+1] != '/') {
+ if (text[i + 1] != '/') {
for (j = 0; j < BB_TAG_NUM; j++) {
k = i + 1;
- if (!wcsnicmp(text+k, bbTagName[j], bbTagNameLen[j])) {
+ if (!wcsnicmp(text + k, bbTagName[j], bbTagNameLen[j])) {
tagArgStart = tagArgEnd = 0;
k += bbTagNameLen[j];
if (bbTagArg[j]) {
if (text[k] != '=') continue;
k++;
tagArgStart = k;
- for (; text[k]!='\0'; k++) {
- if (text[k]==']') break;
+ for (; text[k] != '\0'; k++) {
+ if (text[k] == ']') break;
}
tagArgEnd = k;
}
@@ -262,9 +175,9 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) { tagDataStart = k;
if (k < bbTagEnd[j]) k = bbTagEnd[j];
for (; k < l; k++) {
- if (text[k] == '[' && text[k+1] == '/') {
+ if (text[k] == '[' && text[k + 1] == '/') {
k += 2;
- if (!wcsnicmp(text+k, bbTagName[j], bbTagNameLen[j])) {
+ if (!wcsnicmp(text + k, bbTagName[j], bbTagNameLen[j])) {
k += bbTagNameLen[j];
if (text[k] == ']') {
k++;
@@ -291,7 +204,8 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) { bbTagCount[j]++;
if (bbTagArg[j]) {
bbToken = new TextToken(BBCODE, text + tagArgStart, tagArgEnd - tagArgStart);
- } else {
+ }
+ else {
bbToken = new TextToken(BBCODE, bbTagName[j], bbTagNameLen[j]);
}
bbToken->setTag(bbTagId[j]);
@@ -315,10 +229,11 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) { break;
}
}
- } else {
+ }
+ else {
for (j = 0; j < BB_TAG_NUM; j++) {
k = i + 2;
- if (bbTagCount[j]>0 && !wcsnicmp(text+k, bbTagName[j], bbTagNameLen[j])) {
+ if (bbTagCount[j]>0 && !wcsnicmp(text + k, bbTagName[j], bbTagNameLen[j])) {
k += bbTagNameLen[j];
if (text[k] == ']') {
k++;
@@ -338,21 +253,23 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) { }
}
if (!bbFound) {
- if (i==l) {
+ if (i == l) {
newTokenType = END;
newTokenSize = 1;
- } else {
+ }
+ else {
newTokenType = TEXT;
newTokenSize = 1;
}
}
if (newTokenType != TEXT) {
- if (textLen >0 ) {
- TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);
+ if (textLen > 0) {
+ TextToken *newToken = new TextToken(TEXT, text + i - textLen, textLen);
textLen = 0;
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
@@ -360,12 +277,14 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) { if (newTokenType == BBCODE) {
if (lastToken == NULL) {
firstToken = bbToken;
- } else {
+ }
+ else {
lastToken->setNext(bbToken);
}
lastToken = bbToken;
}
- } else {
+ }
+ else {
textLen += newTokenSize;
}
i += newTokenSize;
@@ -377,47 +296,54 @@ TextToken* TextToken::tokenizeLinks(const wchar_t *text) { TextToken *firstToken = NULL, *lastToken = NULL;
int textLen = 0;
int l = (int)wcslen(text);
- for (int i=0; i<=l;) {
+ for (int i = 0; i <= l;) {
int newTokenType, newTokenSize;
- int urlLen = Utils::detectURL(text+i);
+ int urlLen = Utils::detectURL(text + i);
if (i == l) {
newTokenType = END;
newTokenSize = 1;
- } else if (urlLen > 0) {
+ }
+ else if (urlLen > 0) {
newTokenType = LINK;
newTokenSize = urlLen;
- } else if (!wcsncmp(text+i, L"www.", 4)) {
+ }
+ else if (!wcsncmp(text + i, L"www.", 4)) {
newTokenType = WWWLINK;
- newTokenSize = countNoWhitespace(text+i);
- } else if (!wcsncmp(text+i, L"mailto:", 7)) {
+ newTokenSize = countNoWhitespace(text + i);
+ }
+ else if (!wcsncmp(text + i, L"mailto:", 7)) {
newTokenType = LINK;
- newTokenSize = countNoWhitespace(text+i);
- } else {
+ newTokenSize = countNoWhitespace(text + i);
+ }
+ else {
newTokenType = TEXT;
newTokenSize = 1;
}
if (newTokenType != TEXT) {
- if (textLen >0 ) {
- TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);
+ if (textLen > 0) {
+ TextToken *newToken = new TextToken(TEXT, text + i - textLen, textLen);
textLen = 0;
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
}
if (newTokenType == WWWLINK || newTokenType == LINK) {
- TextToken *newToken = new TextToken(newTokenType, text+i, newTokenSize);
+ TextToken *newToken = new TextToken(newTokenType, text + i, newTokenSize);
newToken->setLink(newToken->getText());
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
}
- } else {
+ }
+ else {
textLen += newTokenSize;
}
i += newTokenSize;
@@ -438,29 +364,32 @@ TextToken* TextToken::tokenizeSmileys(MCONTACT hContact, const char *proto, cons sp.flag = SAFL_PATH | SAFL_UNICODE | (isSent ? SAFL_OUTGOING : 0);
sp.wstr = (wchar_t *)text;
sp.hContact = hContact;
- spRes = (SMADD_BATCHPARSERES *) CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp);
+ spRes = (SMADD_BATCHPARSERES *)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp);
int last_pos = 0;
if (spRes != NULL) {
for (int i = 0; i < (int)sp.numSmileys; i++) {
if (spRes[i].filepath != NULL && strlen((char *)spRes[i].filepath) > 0) {
if ((int)spRes[i].startChar - last_pos > 0) {
- TextToken *newToken = new TextToken(TEXT, text+last_pos, spRes[i].startChar-last_pos);
+ TextToken *newToken = new TextToken(TEXT, text + last_pos, spRes[i].startChar - last_pos);
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
}
- TextToken *newToken = new TextToken(SMILEY, text+spRes[i].startChar, spRes[i].size);
+ TextToken *newToken = new TextToken(SMILEY, text + spRes[i].startChar, spRes[i].size);
if (sp.oflag & SAFL_UNICODE) {
newToken->setLink((wchar_t *)spRes[i].filepath);
- } else {
+ }
+ else {
newToken->setLink((char *)spRes[i].filepath);
}
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
@@ -470,10 +399,11 @@ TextToken* TextToken::tokenizeSmileys(MCONTACT hContact, const char *proto, cons CallService(MS_SMILEYADD_BATCHFREE, 0, (LPARAM)spRes);
}
if (last_pos < l) {
- TextToken *newToken = new TextToken(TEXT, text+last_pos, l-last_pos);
+ TextToken *newToken = new TextToken(TEXT, text + last_pos, l - last_pos);
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
@@ -486,7 +416,7 @@ TextToken* TextToken::tokenizeChatFormatting(const wchar_t *text) { int textLen = 0;
int l = (int)wcslen(text);
wchar_t* tokenBuffer = new wchar_t[l + 1];
- for (int i=0; i<=l;) {
+ for (int i = 0; i <= l;) {
int newTokenType = TEXT;
int newTokenSize = 1;
int newTokenTag = 0;
@@ -495,66 +425,68 @@ TextToken* TextToken::tokenizeChatFormatting(const wchar_t *text) { bool endToken = false;
- if (i==l) {
+ if (i == l) {
newTokenType = END;
- } else {
+ }
+ else {
if (text[i] == '%') {
newTokenSize = 2;
switch (text[i + 1]) {
- case '%':
- break;
- case 'B':
- endToken = true;
- case 'b':
- newTokenType = BBCODE;
- newTokenTag = BB_B;
- break;
- case 'U':
- endToken = true;
- case 'u':
- newTokenType = BBCODE;
- newTokenTag = BB_U;
- break;
- case 'I':
- endToken = true;
- case 'i':
- newTokenType = BBCODE;
- newTokenTag = BB_I;
- break;
- case 'C':
- endToken = true;
- case 'c':
- newTokenType = BBCODE;
- newTokenTag = BB_COLOR;
- if (!endToken) {
- newTokenText = text + i + 2;
- newTokenTextLen = 7;
- newTokenSize = 9;
- }
- break;
- case 'F':
- endToken = true;
- case 'f':
- newTokenType = BBCODE;
- newTokenTag = BB_BACKGROUND;
- if (!endToken) {
- newTokenText = text + i + 2;
- newTokenTextLen = 7;
- newTokenSize = 9;
- }
- break;
- default:
- newTokenSize = 1;
+ case '%':
+ break;
+ case 'B':
+ endToken = true;
+ case 'b':
+ newTokenType = BBCODE;
+ newTokenTag = BB_B;
+ break;
+ case 'U':
+ endToken = true;
+ case 'u':
+ newTokenType = BBCODE;
+ newTokenTag = BB_U;
+ break;
+ case 'I':
+ endToken = true;
+ case 'i':
+ newTokenType = BBCODE;
+ newTokenTag = BB_I;
+ break;
+ case 'C':
+ endToken = true;
+ case 'c':
+ newTokenType = BBCODE;
+ newTokenTag = BB_COLOR;
+ if (!endToken) {
+ newTokenText = text + i + 2;
+ newTokenTextLen = 7;
+ newTokenSize = 9;
+ }
+ break;
+ case 'F':
+ endToken = true;
+ case 'f':
+ newTokenType = BBCODE;
+ newTokenTag = BB_BACKGROUND;
+ if (!endToken) {
+ newTokenText = text + i + 2;
+ newTokenTextLen = 7;
+ newTokenSize = 9;
+ }
+ break;
+ default:
+ newTokenSize = 1;
}
}
}
if (newTokenType != TEXT) {
- if (textLen >0 ) {
+ if (textLen > 0) {
TextToken *newToken = new TextToken(TEXT, tokenBuffer, textLen);
textLen = 0;
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
@@ -565,12 +497,14 @@ TextToken* TextToken::tokenizeChatFormatting(const wchar_t *text) { newToken->setTag(newTokenTag);
if (lastToken == NULL) {
firstToken = newToken;
- } else {
+ }
+ else {
lastToken->setNext(newToken);
}
lastToken = newToken;
}
- } else {
+ }
+ else {
tokenBuffer[textLen] = text[i];
textLen++;
}
@@ -586,46 +520,48 @@ wchar_t *TextToken::htmlEncode(const wchar_t *str) if (str == NULL)
return NULL;
int c = 0;
- for (ptr=str; *ptr!='\0'; ptr++) {
+ for (ptr = str; *ptr != '\0'; ptr++) {
bool wasSpace = false;
- if (*ptr==' ' && wasSpace) {
+ if (*ptr == ' ' && wasSpace) {
wasSpace = true;
c += 6;
- } else {
+ }
+ else {
wasSpace = false;
switch (*ptr) {
- case '\n': c += 4; break;
- case '\r': break;
- case '&': c += 5; break;
- case '>': c += 4; break;
- case '<': c += 4; break;
- case '"': c += 6; break;
- case ' ': wasSpace = true;
- default: c += 1; break;
+ case '\n': c += 4; break;
+ case '\r': break;
+ case '&': c += 5; break;
+ case '>': c += 4; break;
+ case '<': c += 4; break;
+ case '"': c += 6; break;
+ case ' ': wasSpace = true;
+ default: c += 1; break;
}
}
}
- wchar_t *output = new wchar_t[c+1];
- for (out=output, ptr=str; *ptr!='\0'; ptr++) {
+ wchar_t *output = new wchar_t[c + 1];
+ for (out = output, ptr = str; *ptr != '\0'; ptr++) {
bool wasSpace = false;
- if (*ptr==' ' && wasSpace) {
+ if (*ptr == ' ' && wasSpace) {
wcscpy(out, L" ");
out += 6;
- } else {
+ }
+ else {
wasSpace = false;
switch (*ptr) {
- case '\n': wcscpy(out, L"<br>"); out += 4; break;
- case '\r': break;
- case '&': wcscpy(out, L"&"); out += 5; break;
- case '>': wcscpy(out, L">"); out += 4; break;
- case '<': wcscpy(out, L"<"); out += 4; break;
- case '"': wcscpy(out, L"""); out += 6; break;
- case ' ': wasSpace = true;
- default: *out = *ptr; out += 1; break;
+ case '\n': wcscpy(out, L"<br>"); out += 4; break;
+ case '\r': break;
+ case '&': wcscpy(out, L"&"); out += 5; break;
+ case '>': wcscpy(out, L">"); out += 4; break;
+ case '<': wcscpy(out, L"<"); out += 4; break;
+ case '"': wcscpy(out, L"""); out += 6; break;
+ case ' ': wasSpace = true;
+ default: *out = *ptr; out += 1; break;
}
}
}
- *out = '\0';
+ *out = '\0';
return output;
}
@@ -633,190 +569,199 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
wchar_t *eText = NULL, *eLink = NULL;
switch (type) {
- case TEXT:
- eText = htmlEncode(wtext);
- Utils::appendText(str, sizeAlloced, L"%s", eText);
- break;
- case WWWLINK:
- case LINK:
- {
- eText = htmlEncode(wtext);
- eLink = htmlEncode(wlink);
- const wchar_t *linkPrefix = type == WWWLINK ? L"http://" : L"";
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_EMBED)) {
- wchar_t *match = wcsstr(wlink, L"youtube.com");
- if (match != NULL) {
- match = wcsstr(match + 11, L"v=");
- if (match != NULL) {
- match += 2;
- wchar_t *match2 = wcsstr(match, L"&");
- int len = match2 != NULL ? match2 - match : (int)wcslen(match);
- match = mir_wstrdup(match);
- match[len] = 0;
- int width ;
- int height;
- int Embedsize = Options::getEmbedsize();
- switch (Embedsize){
- case 0:
- width = 320;
- height = 205;
- break;
- case 1:
- width = 480;
- height = 385;
- break;
- case 2:
- width = 560;
- height = 349;
- break;
- case 3:
- width = 640;
- height = 390;
- break;
-
- };
-
- Utils::appendText(str, sizeAlloced, L"<div><object width=\"%d\" height=\"%d\">\
- <param name=\"movie\" value=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\"/>\
- <param name=\"allowFullScreen\" value=\"true\"/>\
- <param name=\"allowScriptAccess\" value=\"true\"/>\
- <embed src=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\" type=\"application/x-shockwave-flash\" allowfullscreen=\"true\" allowScriptAccess=\"always\" width=\"%d\" height=\"%d\"/>\
- </object></div>", width, height, match, match, width, height);
- mir_free(match);
- break;
- }
- }
+ case TEXT:
+ eText = htmlEncode(wtext);
+ Utils::appendText(str, sizeAlloced, L"%s", eText);
+ break;
+ case WWWLINK:
+ case LINK:
+ {
+ eText = htmlEncode(wtext);
+ eLink = htmlEncode(wlink);
+ const wchar_t *linkPrefix = type == WWWLINK ? L"http://" : L"";
+ if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_EMBED)) {
+ wchar_t *match = wcsstr(wlink, L"youtube.com");
+ if (match != NULL) {
+ match = wcsstr(match + 11, L"v=");
+ if (match != NULL) {
+ match += 2;
+ wchar_t *match2 = wcsstr(match, L"&");
+ int len = match2 != NULL ? match2 - match : (int)wcslen(match);
+ match = mir_wstrdup(match);
+ match[len] = 0;
+ int width;
+ int height;
+ int Embedsize = Options::getEmbedsize();
+ switch (Embedsize){
+ case 0:
+ width = 320;
+ height = 205;
+ break;
+ case 1:
+ width = 480;
+ height = 385;
+ break;
+ case 2:
+ width = 560;
+ height = 349;
+ break;
+ case 3:
+ width = 640;
+ height = 390;
+ break;
+
+ };
+
+ Utils::appendText(str, sizeAlloced, L"<div><object width=\"%d\" height=\"%d\">\
+ <param name=\"movie\" value=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\"/>\
+ <param name=\"allowFullScreen\" value=\"true\"/>\
+ <param name=\"allowScriptAccess\" value=\"true\"/>\
+ <embed src=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\" type=\"application/x-shockwave-flash\" allowfullscreen=\"true\" allowScriptAccess=\"always\" width=\"%d\" height=\"%d\"/>\
+ </object></div>", width, height, match, match, width, height);
+ mir_free(match);
+ break;
}
- Utils::appendText(str, sizeAlloced, L"<a class=\"link\" target=\"_self\" href=\"%s%s\">%s</a>", linkPrefix, eLink, eText);
- }
- break;
- case SMILEY:
- eText = htmlEncode(wtext);
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(wlink, L".swf")!=NULL)) {
- Utils::appendText(str, sizeAlloced,
- L"<span title=\"%s\" class=\"img\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
- codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" >\
- <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></span><span style=\"position:absolute; visibility:hidden;\">%s</span>",
- eText, wlink, eText);
- } else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png")!=NULL)) {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" title=\"%s\" alt=\"%s\"/><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText, eText);
- } else {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" title=\"%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText, eText);
}
- break;
- case MATH:
- eText = htmlEncode(wtext);
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png")!=NULL)) {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>",wlink , eText, eText);
- } else {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);
- }
- break;
- case BBCODE:
- if (!end) {
- switch (tag) {
- case BB_B:
- //Utils::appendText(str, sizeAlloced, L"<span style=\"font-weight: bold;\">");
- Utils::appendText(str, sizeAlloced, L"<b>");
- break;
- case BB_I:
- //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
- Utils::appendText(str, sizeAlloced, L"<i>");
- break;
- case BB_U:
- //Utils::appendText(str, sizeAlloced, L"<span style=\"text-decoration: underline;\">");
- Utils::appendText(str, sizeAlloced, L"<u>");
- break;
- case BB_S:
- //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
- Utils::appendText(str, sizeAlloced, L"<s>");
- break;
- case BB_CODE:
- //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
- Utils::appendText(str, sizeAlloced, L"<pre class=\"code\">");
- break;
- case BB_IMG:
- eText = htmlEncode(wtext);
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && eText != NULL && (wcsstr(eText, L".swf")!=NULL)) {
- Utils::appendText(str, sizeAlloced,
- L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
- codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\
- <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",
- eText);
- } else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && eText != NULL && (wcsstr(eText, L".png")!=NULL)) {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);
- } else {
- if (eText != NULL && wcsncmp(eText, L"http://", 7)) {
- Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);
- } else {
- Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"%s\" /></div>", eText);
- }
- }
- break;
- case BB_BIMG:
- eText = htmlEncode(mir_ptr<wchar_t>(Utils::toAbsolute(wtext)));
-
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf")!=NULL)) {
- Utils::appendText(str, sizeAlloced,
- L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
- codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\
- <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",
- eText);
- } else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(eText, L".png")!=NULL)) {
- Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);
- } else {
+ }
+ Utils::appendText(str, sizeAlloced, L"<a class=\"link\" target=\"_self\" href=\"%s%s\">%s</a>", linkPrefix, eLink, eText);
+ }
+ break;
+ case SMILEY:
+ eText = htmlEncode(wtext);
+ if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(wlink, L".swf") != NULL)) {
+ Utils::appendText(str, sizeAlloced,
+ L"<span title=\"%s\" class=\"img\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
+ codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" >\
+ <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></span><span style=\"position:absolute; visibility:hidden;\">%s</span>",
+ eText, wlink, eText);
+ }
+ else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png") != NULL)) {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" title=\"%s\" alt=\"%s\"/><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText, eText);
+ }
+ else {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" title=\"%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText, eText);
+ }
+ break;
+ case MATH:
+ eText = htmlEncode(wtext);
+ if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png") != NULL)) {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);
+ }
+ else {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);
+ }
+ break;
+ case BBCODE:
+ if (!end) {
+ switch (tag) {
+ case BB_B:
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"font-weight: bold;\">");
+ Utils::appendText(str, sizeAlloced, L"<b>");
+ break;
+ case BB_I:
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
+ Utils::appendText(str, sizeAlloced, L"<i>");
+ break;
+ case BB_U:
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"text-decoration: underline;\">");
+ Utils::appendText(str, sizeAlloced, L"<u>");
+ break;
+ case BB_S:
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
+ Utils::appendText(str, sizeAlloced, L"<s>");
+ break;
+ case BB_CODE:
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"font-style: italic;\">");
+ Utils::appendText(str, sizeAlloced, L"<pre class=\"code\">");
+ break;
+ case BB_IMG:
+ eText = htmlEncode(wtext);
+ if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && eText != NULL && (wcsstr(eText, L".swf") != NULL)) {
+ Utils::appendText(str, sizeAlloced,
+ L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
+ codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\
+ <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",
+ eText);
+ }
+ else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && eText != NULL && (wcsstr(eText, L".png") != NULL)) {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);
+ }
+ else {
+ if (eText != NULL && wcsncmp(eText, L"http://", 7)) {
Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);
}
- break;
- case BB_URL:
- eText = htmlEncode(wtext);
- eLink = htmlEncode(wlink);
- Utils::appendText(str, sizeAlloced, L"<a href =\"%s\">%s</a>", eLink, eText);
- break;
- case BB_COLOR:
- eText = htmlEncode(wtext);
- //Utils::appendText(str, sizeAlloced, L"<span style=\"color: %s;\">", eText);
- Utils::appendText(str, sizeAlloced, L"<font color =\"%s\">", eText);
- break;
- case BB_BACKGROUND:
- eText = htmlEncode(wtext);
- Utils::appendText(str, sizeAlloced, L"<span style=\"background: %s;\">", eText);
- break;
- case BB_SIZE:
- eText = htmlEncode(wtext);
- Utils::appendText(str, sizeAlloced, L"<span style=\"font-size: %s;\">", eText);
- break;
+ else {
+ Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"%s\" /></div>", eText);
+ }
}
- } else {
- switch (tag) {
- case BB_B:
- Utils::appendText(str, sizeAlloced, L"</b>");
- break;
- case BB_I:
- Utils::appendText(str, sizeAlloced, L"</i>");
- break;
- case BB_U:
- Utils::appendText(str, sizeAlloced, L"</u>");
- break;
- case BB_S:
- Utils::appendText(str, sizeAlloced, L"</s>");
- break;
- case BB_CODE:
- Utils::appendText(str, sizeAlloced, L"</pre>");
- break;
- case BB_COLOR:
- Utils::appendText(str, sizeAlloced, L"</font>");
- break;
- case BB_SIZE:
- Utils::appendText(str, sizeAlloced, L"</span>");
- break;
- case BB_BACKGROUND:
- Utils::appendText(str, sizeAlloced, L"</span>");
- break;
+ break;
+ case BB_BIMG:
+ eText = htmlEncode(mir_ptr<wchar_t>(Utils::toAbsolute(wtext)));
+
+ if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf") != NULL)) {
+ Utils::appendText(str, sizeAlloced,
+ L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \
+ codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\
+ <param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",
+ eText);
+ }
+ else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(eText, L".png") != NULL)) {
+ Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);
+ }
+ else {
+ Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);
}
+ break;
+ case BB_URL:
+ eText = htmlEncode(wtext);
+ eLink = htmlEncode(wlink);
+ Utils::appendText(str, sizeAlloced, L"<a href =\"%s\">%s</a>", eLink, eText);
+ break;
+ case BB_COLOR:
+ eText = htmlEncode(wtext);
+ //Utils::appendText(str, sizeAlloced, L"<span style=\"color: %s;\">", eText);
+ Utils::appendText(str, sizeAlloced, L"<font color =\"%s\">", eText);
+ break;
+ case BB_BACKGROUND:
+ eText = htmlEncode(wtext);
+ Utils::appendText(str, sizeAlloced, L"<span style=\"background: %s;\">", eText);
+ break;
+ case BB_SIZE:
+ eText = htmlEncode(wtext);
+ Utils::appendText(str, sizeAlloced, L"<span style=\"font-size: %s;\">", eText);
+ break;
+ }
+ }
+ else {
+ switch (tag) {
+ case BB_B:
+ Utils::appendText(str, sizeAlloced, L"</b>");
+ break;
+ case BB_I:
+ Utils::appendText(str, sizeAlloced, L"</i>");
+ break;
+ case BB_U:
+ Utils::appendText(str, sizeAlloced, L"</u>");
+ break;
+ case BB_S:
+ Utils::appendText(str, sizeAlloced, L"</s>");
+ break;
+ case BB_CODE:
+ Utils::appendText(str, sizeAlloced, L"</pre>");
+ break;
+ case BB_COLOR:
+ Utils::appendText(str, sizeAlloced, L"</font>");
+ break;
+ case BB_SIZE:
+ Utils::appendText(str, sizeAlloced, L"</span>");
+ break;
+ case BB_BACKGROUND:
+ Utils::appendText(str, sizeAlloced, L"</span>");
+ break;
}
- break;
+ }
+ break;
}
- if (eText!=NULL) delete eText;
- if (eLink!=NULL) delete eLink;
+ if (eText != NULL) delete eText;
+ if (eLink != NULL) delete eLink;
}
diff --git a/plugins/IEView/src/TextToken.h b/plugins/IEView/src/TextToken.h index e9b2417ca4..68e607cd69 100644 --- a/plugins/IEView/src/TextToken.h +++ b/plugins/IEView/src/TextToken.h @@ -84,7 +84,6 @@ public: static TextToken* tokenizeLinks(const wchar_t *wtext);
static TextToken* tokenizeSmileys(MCONTACT hContact, const char *proto, const wchar_t *wtext, bool isSent);
static TextToken* tokenizeBBCodes(const wchar_t *text);
- static TextToken* tokenizeMath(const wchar_t *text);
static TextToken* tokenizeChatFormatting(const wchar_t *text);
};
#endif
diff --git a/plugins/IEView/src/ieview_common.h b/plugins/IEView/src/ieview_common.h index fbfb60b3ec..fe3301f549 100644 --- a/plugins/IEView/src/ieview_common.h +++ b/plugins/IEView/src/ieview_common.h @@ -53,7 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_smileyadd.h>
#include <m_ieview.h>
-#include <m_MathModule.h>
#include <m_metacontacts.h>
#include "IEView.h"
diff --git a/plugins/IEView/src/resource.h b/plugins/IEView/src/resource.h index 073073f64e..ce77e9d24f 100644 --- a/plugins/IEView/src/resource.h +++ b/plugins/IEView/src/resource.h @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define IDC_SCROLL_BACKGROUND_IMAGE 1003
#define IDC_ENABLE_BBCODES 1004
#define IDC_ENABLE_FLASH 1005
-#define IDC_ENABLE_MATHMODULE 1006
#define IDC_ENABLE_PNGHACK 1007
#define IDC_SMILEYS_IN_NAMES 1008
#define IDC_NO_BORDER 1009
diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h index 408feb8ba8..ee2e8c56eb 100644 --- a/plugins/MyDetails/src/commons.h +++ b/plugins/MyDetails/src/commons.h @@ -46,7 +46,6 @@ Boston, MA 02111-1307, USA. #include <m_proto_listeningto.h>
#include <m_listeningto.h>
#include <m_statusplugins.h>
-#include <m_simpleaway.h>
#include <m_smileyadd.h>
#include <m_mydetails.h>
#include <m_skin_eng.h>
diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp index c6afc471e8..8244c6e7b2 100644 --- a/plugins/MyDetails/src/data.cpp +++ b/plugins/MyDetails/src/data.cpp @@ -219,10 +219,6 @@ void Protocol::GetStatusMsg(int aStatus, TCHAR *msg, size_t msg_size) ptrT tmp((TCHAR *)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR));
lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);
}
- else if (ServiceExists(MS_AWAYMSG_GETSTATUSMSGT)) {
- ptrT tmp((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, 0));
- lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);
- }
}
TCHAR* Protocol::GetStatusMsg()
@@ -443,13 +439,6 @@ Protocol *ProtocolArray::Get(const char *name) return NULL;
}
-
-bool ProtocolArray::CanSetStatusMsgPerProtocol()
-{
- return ServiceExists(MS_SA_CHANGESTATUSMSG) != 0;
-}
-
-
void ProtocolArray::GetAvatars()
{
for (int i = 0; i < buffer_len; i++)
@@ -558,12 +547,6 @@ TCHAR *ProtocolArray::GetDefaultStatusMsg(int status) if (status == ID_STATUS_CONNECTING)
status = ID_STATUS_OFFLINE;
- TCHAR *tmp = (TCHAR *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)status, 0);
- if (tmp != NULL) {
- lstrcpyn(default_status_message, tmp, SIZEOF(default_status_message));
- mir_free(tmp);
- }
-
return default_status_message;
}
diff --git a/plugins/MyDetails/src/data.h b/plugins/MyDetails/src/data.h index 53bc6ade9d..803c6ecc23 100644 --- a/plugins/MyDetails/src/data.h +++ b/plugins/MyDetails/src/data.h @@ -134,8 +134,6 @@ public: void GetStatuses();
int GetGlobalStatus();
- bool CanSetStatusMsgPerProtocol();
-
void GetDefaultNick(); // Copy to cache
void GetDefaultAvatar(); // Copy to cache
TCHAR *GetDefaultStatusMsg(); // Copy to cache
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 2469e22728..3e1309edd8 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -1806,26 +1806,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar HMENU submenu = GetSubMenu(menu, 3);
TranslateMenu(submenu);
- if (protocols->CanSetStatusMsgPerProtocol()) {
- // Add this proto to menu
- mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."), proto->description);
-
- MENUITEMINFO mii = {0};
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_ID | MIIM_TYPE;
- mii.fType = MFT_STRING;
- mii.dwTypeData = tmp;
- mii.cch = (int)_tcslen(tmp);
- mii.wID = 1;
-
- if (!proto->CanSetStatusMsg()) {
- mii.fMask |= MIIM_STATE;
- mii.fState = MFS_DISABLED;
- }
-
- InsertMenuItem(submenu, 0, TRUE, &mii);
- }
-
// Add this to menu
mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."),
CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, proto->status, GSMDF_TCHAR));
@@ -1927,26 +1907,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii);
- if (protocols->CanSetStatusMsgPerProtocol()) {
- // Add this proto to menu
- mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."), proto->description);
-
- ZeroMemory(&mii, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_ID | MIIM_TYPE;
- mii.fType = MFT_STRING;
- mii.dwTypeData = tmp;
- mii.cch = (int)_tcslen(tmp);
- mii.wID = 3;
-
- if ( !proto->CanSetStatusMsg()) {
- mii.fMask |= MIIM_STATE;
- mii.fState = MFS_DISABLED;
- }
-
- InsertMenuItem(submenu, 0, TRUE, &mii);
- }
-
mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my nickname for %s..."), proto->description);
ZeroMemory(&mii, sizeof(mii));
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 7b8d6bf2f3..5316f302eb 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -488,19 +488,9 @@ static INT_PTR PluginCommand_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam) if (proto_num == -1)
return -1;
- if (protocols->CanSetStatusMsgPerProtocol() && !proto->CanSetStatusMsg())
+ if (!proto->CanSetStatusMsg())
return -2;
}
- else if (ServiceExists(MS_SA_CHANGESTATUSMSG)) {
- if (proto == NULL && status == 0)
- CallService(MS_SA_CHANGESTATUSMSG, protocols->GetGlobalStatus(), NULL);
- else if (status == 0)
- CallService(MS_SA_CHANGESTATUSMSG, proto->status, (LPARAM)proto_name);
- else
- CallService(MS_SA_CHANGESTATUSMSG, status, (LPARAM)proto_name);
-
- return 0;
- }
if (proto == NULL || proto->status != ID_STATUS_OFFLINE) {
if (!status_msg_dialog_open) {
diff --git a/plugins/NewAwaySysMod/NewAwaySys_12.vcxproj b/plugins/NewAwaySysMod/NewAwaySys_12.vcxproj index e0731ab734..c4d959a7d7 100644 --- a/plugins/NewAwaySysMod/NewAwaySys_12.vcxproj +++ b/plugins/NewAwaySysMod/NewAwaySys_12.vcxproj @@ -82,7 +82,6 @@ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeaderFile>Common.h</PrecompiledHeaderFile>
</ClCompile>
<Link>
@@ -91,6 +90,7 @@ <SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -114,6 +114,7 @@ <SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -143,6 +144,7 @@ <SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -172,6 +174,7 @@ <SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
+ <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 0dae3e2a38..225620bdce 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -34,7 +34,6 @@ #include "m_idle.h"
#include "m_statusplugins.h"
#include "m_NewAwaySys.h"
-#include "m_ContactSettings.h"
#include "MsgTree.h"
#include "ContactList.h"
#include "Properties.h"
@@ -159,32 +158,6 @@ int StatusMsgReq(WPARAM wParam, LPARAM lParam, CString &szProto) if (!iMode)
VarParseData.Flags |= VPF_XSTATUS;
- TCString LogMsg;
- if (!iMode) { // if it's an xstatus message request
- LogMsg = db_get_s(NULL, szProto, "XStatusName", _T(""));
- TCString XMsg(db_get_s(NULL, szProto, "XStatusMsg", _T("")));
- if (XMsg.GetLen()) {
- if (LogMsg.GetLen())
- LogMsg += _T("\r\n");
-
- LogMsg += XMsg;
- }
- }
- else LogMsg = VarParseData.Message;
-
- if (ServiceExists(MS_VARS_FORMATSTRING))
- logservice_log(LOG_ID, hFoundContact, LogMsg);
- else {
- TCString szUIN;
- _ultot(lParam, szUIN.GetBuffer(16), 10);
- szUIN.ReleaseBuffer();
- TCHAR *szStatDesc = iMode ? pcli->pfnGetStatusModeDescription(iMode, 0) : STR_XSTATUSDESC;
- if (!szStatDesc) {
- _ASSERT(0);
- szStatDesc = _T("");
- }
- logservice_log(LOG_ID, hFoundContact, TCString(pcli->pfnGetContactDisplayName(hFoundContact, 0)) + _T(" (") + szUIN + TranslateT(") read your ") + szStatDesc + TranslateT(" message:\r\n") + LogMsg);
- }
return 0;
}
@@ -473,70 +446,6 @@ static int IconsChanged(WPARAM, LPARAM) return 0;
}
-static int ContactSettingsInit(WPARAM wParam, LPARAM)
-{
- CONTACTSETTINGSINIT *csi = (CONTACTSETTINGSINIT*)wParam;
- char *szProto = (csi->Type == CSIT_CONTACT) ? GetContactProto(csi->hContact) : NULL;
- if ((csi->Type == CSIT_GROUP) || szProto) {
- int Flag1 = (csi->Type == CSIT_CONTACT) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) : PF1_IM; // we assume that there can be some contacts in the group with PF1_IM capability
- if ((Flag1 & PF1_IM) == PF1_IM || Flag1 & PF1_INDIVMODEMSG) { // does contact's protocol supports message sending/receiving or individual status messages?
- CONTACTSETTINGSCONTROL csc = { 0 };
- csc.cbSize = sizeof(csc);
- csc.cbStateSize = sizeof(CSCONTROLSTATE);
- csc.Position = CSPOS_SORTBYALPHABET;
- csc.ControlType = CSCT_CHECKBOX;
- csc.szModule = MOD_NAME;
- csc.StateNum = 3;
- csc.DefState = 2; // these settings are used for all controls below
-
- int StatusMode = 0;
- if (csi->Type == CSIT_CONTACT) {
- CContactSettings CSettings(0, csi->hContact);
- StatusMode = CSettings.Status;
- }
- else {
- _ASSERT(csi->Type == CSIT_GROUP);
- StatusMode = g_ProtoStates[(char*)NULL].Status;
- }
-
- if (StatusMode == ID_STATUS_OFFLINE)
- StatusMode = ID_STATUS_AWAY;
-
- CString Setting;
- TCHAR Title[128];
- csc.Flags = CSCF_TCHAR | CSCF_DONT_TRANSLATE_STRINGS; // these Flags and ptszGroup are used for both controls below
- csc.ptszGroup = TranslateT("New Away System");
-
- if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS)) {
- mir_sntprintf(Title, SIZEOF(Title), TranslateT("Enable autoreply when you are %s"), pcli->pfnGetStatusModeDescription(StatusMode, 0));
- csc.ptszTitle = Title;
- csc.ptszTooltip = TranslateT("\"Store contact autoreply/ignore settings for each status separately\" is enabled, so this setting is per-contact AND per-status.");
- }
- else {
- csc.ptszTitle = TranslateT("Enable autoreply");
- csc.ptszTooltip = NULL;
- }
- Setting = StatusToDBSetting(StatusMode, DB_ENABLEREPLY, IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS);
- csc.szSetting = Setting;
- CallService(MS_CONTACTSETTINGS_ADDCONTROL, wParam, (LPARAM)&csc);
-
- if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS)) {
- mir_sntprintf(Title, SIZEOF(Title), TranslateT("Don't send status message when you are %s"), pcli->pfnGetStatusModeDescription(StatusMode, 0));
- csc.ptszTitle = Title;
- csc.ptszTooltip = TranslateT("Ignore status message requests from this contact and don't send an autoreply.\r\n\"Store contact autoreply/ignore settings for each status separately\" is enabled, so this setting is per-contact AND per-status.");
- }
- else {
- csc.ptszTitle = TranslateT("Don't send status message");
- csc.ptszTooltip = TranslateT("Ignore status message requests from this contact and don't send an autoreply");
- }
- Setting = StatusToDBSetting(StatusMode, DB_IGNOREREQUESTS, IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS);
- csc.szSetting = Setting;
- CallService(MS_CONTACTSETTINGS_ADDCONTROL, wParam, (LPARAM)&csc);
- }
- }
- return 0;
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
// variables
@@ -700,7 +609,6 @@ int MirandaLoaded(WPARAM, LPARAM) HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PreBuildContactMenu);
HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged);
HookEvent(ME_IDLE_CHANGED, IdleChangeEvent);
- HookEvent(ME_CONTACTSETTINGS_INITIALISE, ContactSettingsInit);
g_hReadWndList = WindowList_Create();
@@ -801,8 +709,6 @@ extern "C" int __declspec(dllexport) Load(void) InitCommonControls();
InitOptions(); // must be called before we hook CallService
- logservice_register(LOG_ID, LPGENT("New Away System"), _T("NewAwaySys?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) read your %nas_statdesc% message:\r\n%extratext%\r\n\r\n"));
-
if (db_get_b(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1) { // change all %nas_message% variables to %extratext% if it wasn't done before
TCString Str = db_get_s(NULL, MOD_NAME, "PopupsFormat", _T(""));
if (Str.GetLen())
diff --git a/plugins/NewAwaySysMod/src/Common.h b/plugins/NewAwaySysMod/src/Common.h index 95d3268684..f9ca1ef548 100644 --- a/plugins/NewAwaySysMod/src/Common.h +++ b/plugins/NewAwaySysMod/src/Common.h @@ -67,9 +67,6 @@ #include "m_toptoolbar.h"
#include "m_popup.h"
#include "m_metacontacts.h"
-#include "m_LogService.h"
-
-#pragma comment(lib,"comctl32.lib")
#include "CString.h"
#include "Options.h"
diff --git a/plugins/New_GPG/src/commonheaders.h b/plugins/New_GPG/src/commonheaders.h index 01a1d59ff5..5af43c1c9e 100644 --- a/plugins/New_GPG/src/commonheaders.h +++ b/plugins/New_GPG/src/commonheaders.h @@ -62,7 +62,7 @@ using std::fstream; #include <m_skin.h> #include <m_protomod.h> #include <m_jabber.h> -#include <m_icqplus.h> +#include <m_icq.h> #include <m_message.h> #include <m_cluiframes.h> #include <m_icolib.h> diff --git a/plugins/NotifyAnything/src/common.h b/plugins/NotifyAnything/src/common.h index ff1f9c2588..0b44f0e8db 100644 --- a/plugins/NotifyAnything/src/common.h +++ b/plugins/NotifyAnything/src/common.h @@ -16,8 +16,6 @@ #include "m_database.h"
#include "m_popup.h"
-#include "m_LogService.h"
-
#include "resource.h"
#include "Version.h"
@@ -49,5 +47,4 @@ void load_settings(); int OptionsInitialize(WPARAM wParam, LPARAM lParam);
extern std::string g_mirandaDir;
-extern bool IsLogService;
#define LOG_ID LPGEN("NotifyAnything")
diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp index dc93702c32..a545a16518 100644 --- a/plugins/NotifyAnything/src/main.cpp +++ b/plugins/NotifyAnything/src/main.cpp @@ -17,30 +17,18 @@ back to the main thread. void cslog(const char *what, const char *file, int line)
{
- if (IsLogService){
- std::string LogString;
- char buf[10];
- LogString = what;
- LogString += ": ";
- LogString += file;
- LogString += ":";
- LogString += itoa(line, buf, 10);
- logservice_log(LOG_ID, NULL, (TCHAR *) LogString.c_str());
- }
- else {
- if (g_settings.log_to_file) {
- time_t t_;
- time(&t_);
- tm *t = localtime(&t_);
- //FILE *f = fopen("na.log", "a");
- FILE *f = fopen(g_settings.log_filename.c_str(), "a");
- if (f) {
- //fprintf(f, "%s: %s:%i\n", what, file, line);
- fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i cs] %s: %s:%i\n",
- int(t->tm_year+1900), int(t->tm_mon), int(t->tm_mday),
- int(t->tm_hour), int(t->tm_min), int(t->tm_sec), what, file, line);
- fclose(f);
- }
+ if (g_settings.log_to_file) {
+ time_t t_;
+ time(&t_);
+ tm *t = localtime(&t_);
+ //FILE *f = fopen("na.log", "a");
+ FILE *f = fopen(g_settings.log_filename.c_str(), "a");
+ if (f) {
+ //fprintf(f, "%s: %s:%i\n", what, file, line);
+ fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i cs] %s: %s:%i\n",
+ int(t->tm_year + 1900), int(t->tm_mon), int(t->tm_mday),
+ int(t->tm_hour), int(t->tm_min), int(t->tm_sec), what, file, line);
+ fclose(f);
}
}
}
@@ -64,7 +52,6 @@ SOCKET g_udp_socket, g_tcp_socket; volatile bool g_exit_threads, g_firstrun;
std::string g_mirandaDir;
CRITICAL_SECTION g_wsocklock;
-bool IsLogService;
HINSTANCE hInst;
int hLangpack;
@@ -80,7 +67,7 @@ PLUGININFOEX pluginInfo = { __AUTHORWEB,
UNICODE_AWARE,
// {E92874EC-594A-4A2F-BDED-C0BE8B5A45D1}
- {0xe92874ec, 0x594a, 0x4a2f, {0xbd, 0xed, 0xc0, 0xbe, 0x8b, 0x5a, 0x45, 0xd1}}
+ { 0xe92874ec, 0x594a, 0x4a2f, { 0xbd, 0xed, 0xc0, 0xbe, 0x8b, 0x5a, 0x45, 0xd1 } }
};
BOOL WINAPI DllMain(HINSTANCE hi, DWORD, LPVOID)
@@ -117,8 +104,8 @@ std::string strip(std::string str) {
while (!str.empty() && isspace(str[0]))
str.erase(0, 1);
- while (!str.empty() && isspace(*(str.end()-1)))
- str.erase(str.size()-1);
+ while (!str.empty() && isspace(*(str.end() - 1)))
+ str.erase(str.size() - 1);
return str;
}
@@ -127,23 +114,18 @@ void dbg_msg(std::string str, int type) str = strip(str);
if (g_settings.debug_messages)
- CallServiceSync(MS_POPUP_SHOWMESSAGE, (WPARAM) const_cast<char *>(str.c_str()), (LPARAM) type);
-
- if (IsLogService){
- logservice_log(LOG_ID, NULL, (TCHAR *) str.c_str());
- }
- else {
- if (g_settings.log_to_file) {
- time_t t_;
- time(&t_);
- tm *t = localtime(&t_);
- FILE *f = fopen(g_settings.log_filename.c_str(), "a");
- if (f) {
- fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i dbg_msg] %s\n",
- int(t->tm_year+1900), int(t->tm_mon), int(t->tm_mday),
- int(t->tm_hour), int(t->tm_min), int(t->tm_sec), str.c_str());
- fclose(f);
- }
+ CallServiceSync(MS_POPUP_SHOWMESSAGE, (WPARAM) const_cast<char *>(str.c_str()), (LPARAM)type);
+
+ if (g_settings.log_to_file) {
+ time_t t_;
+ time(&t_);
+ tm *t = localtime(&t_);
+ FILE *f = fopen(g_settings.log_filename.c_str(), "a");
+ if (f) {
+ fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i dbg_msg] %s\n",
+ int(t->tm_year + 1900), int(t->tm_mon), int(t->tm_mday),
+ int(t->tm_hour), int(t->tm_min), int(t->tm_sec), str.c_str());
+ fclose(f);
}
}
}
@@ -153,10 +135,10 @@ void showLastError() int err = GetLastError();
LPVOID lpMsgBuf;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL);
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL);
- dbg_msg((char *) lpMsgBuf, SM_WARNING);
+ dbg_msg((char *)lpMsgBuf, SM_WARNING);
LocalFree(lpMsgBuf);
}
@@ -169,7 +151,7 @@ struct enum_icons_t { BOOL CALLBACK enum_icons_func(HMODULE, LPCTSTR, LPTSTR name, LONG_PTR data)
{
- enum_icons_t *info = (enum_icons_t *) data;
+ enum_icons_t *info = (enum_icons_t *)data;
if (!--info->nr) {
info->found = true;
info->name = name;
@@ -232,8 +214,8 @@ HICON getIcon(const std::string &name) if (p == name.npos) {
// try to load icon file
HANDLE h = LoadImageA(NULL, name.c_str(), IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
- if (h != NULL)
- return icons[name] = (HICON) h;
+ if (h != NULL)
+ return icons[name] = (HICON)h;
showLastError();
return deficon;
@@ -241,7 +223,7 @@ HICON getIcon(const std::string &name) std::tstring file((TCHAR*)_A2T(name.c_str()), 0, p);
- std::tstring rname(file.c_str(), p+1);
+ std::tstring rname(file.c_str(), p + 1);
if (rname.empty()) {
dbg_msg(Translate("No resource name given."), SM_WARNING);
return deficon;
@@ -262,8 +244,8 @@ HICON getIcon(const std::string &name) dbg_msg("Icon indices start at 1.", SM_WARNING);
return deficon;
}
-
- BOOL ok = EnumResourceNames(module, RT_GROUP_ICON, enum_icons_func, (LONG_PTR) &info);
+
+ BOOL ok = EnumResourceNames(module, RT_GROUP_ICON, enum_icons_func, (LONG_PTR)&info);
if (!info.found) {
if (!ok) {
if (GetLastError()) {
@@ -277,7 +259,7 @@ HICON getIcon(const std::string &name) resname = info.name;
}
- HICON icon = (HICON) LoadImage(module, resname, IMAGE_ICON, 16, 16, 0);
+ HICON icon = (HICON)LoadImage(module, resname, IMAGE_ICON, 16, 16, 0);
FreeLibrary(module);
if (!icon) {
@@ -285,7 +267,7 @@ HICON getIcon(const std::string &name) return deficon;
}
- return icons[name] = (HICON) icon;
+ return icons[name] = (HICON)icon;
}
bool getNext(std::string &out, std::string &in, char sep)
@@ -297,18 +279,18 @@ bool getNext(std::string &out, std::string &in, char sep) while (!in.empty()) {
if (in[0] == sep) {
- in.erase(0,1);
+ in.erase(0, 1);
return true;
}
if (in[0] == '\"') {
- in.erase(0,1);
+ in.erase(0, 1);
size_t p = in.find('\"');
if (p == in.npos)
throw "Unterminated quote: \"" + in;
out += '"';
out.append(in, 0, p);
out += '"';
- in.erase(0, p+1);
+ in.erase(0, p + 1);
return true;
}
if (!in.compare(0, 3, "<[[")) {
@@ -317,12 +299,12 @@ bool getNext(std::string &out, std::string &in, char sep) if (p == in.npos)
throw "Unterminated \"<[[\": <[[" + in;
out.append(in, 0, p);
- in.erase(0, p+3);
+ in.erase(0, p + 3);
return true;
}
out += in[0];
- in.erase(0,1);
+ in.erase(0, 1);
return true;
}
return false;
@@ -341,9 +323,9 @@ void getAll(std::vector<std::string> &out, std::string &in, char sep, bool unquo std::string arg;
while (getNext(arg, in, sep))
if (!arg.empty()) {
- if (unquote_)
- arg = unquote(arg);
- out.push_back(arg);
+ if (unquote_)
+ arg = unquote(arg);
+ out.push_back(arg);
}
}
@@ -380,7 +362,7 @@ void processSingleAction(const std::string &what, bool &closeflag) throw "Insufficient arguments: " + what;
std::vector<const char *> cargs;
- for (std::vector<std::string>::iterator i=args.begin(), e=args.end(); i!=e; ++i)
+ for (std::vector<std::string>::iterator i = args.begin(), e = args.end(); i != e; ++i)
cargs.push_back(i->c_str());
cargs.push_back(0);
@@ -404,10 +386,11 @@ void processSingleAction(const std::string &what, bool &closeflag) const char *cargs = decode_se_arg(args);
- if ((int) ShellExecuteA(0, "open", file.c_str(), cargs, 0, SW_SHOWNORMAL) <= 32)
+ if ((int)ShellExecuteA(0, "open", file.c_str(), cargs, 0, SW_SHOWNORMAL) <= 32)
throw "Failed to open: " + file + " " + args;
- } else if (!what.compare(0, 6, "shell:")) {
+ }
+ else if (!what.compare(0, 6, "shell:")) {
if (!g_settings.allow_execute) {
dbg_msg(Translate("Application launching is disabled."), SM_WARNING);
return;
@@ -427,10 +410,11 @@ void processSingleAction(const std::string &what, bool &closeflag) args = strip(args);
dir = /*unquote(*/strip(dir)/*)*/;
- if ((int) ShellExecuteA(0, decode_se_arg(verb), decode_se_arg(file),
+ if ((int)ShellExecuteA(0, decode_se_arg(verb), decode_se_arg(file),
decode_se_arg(args), decode_se_arg(dir), SW_SHOWNORMAL) <= 32)
throw "Failed: " + what;
- } else if (what == "close")
+ }
+ else if (what == "close")
closeflag = true;
else
throw "Action not recognized: " + what;
@@ -456,47 +440,47 @@ void processAction(const std::string &what, bool &closeflag) static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
popup_t *pd = 0;
- pd = (popup_t *) CallService(MS_POPUP_GETPLUGINDATA, (WPARAM) hWnd, (LPARAM) pd);
+ pd = (popup_t *)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hWnd, (LPARAM)pd);
if (!pd)
return FALSE;
switch (message) {
case WM_COMMAND:
- {
- EnterCS(&g_popups_cs);
- std::string left;
- if (pd)
- left = pd->left;
- LeaveCS(&g_popups_cs);
+ {
+ EnterCS(&g_popups_cs);
+ std::string left;
+ if (pd)
+ left = pd->left;
+ LeaveCS(&g_popups_cs);
- if (left.empty())
+ if (left.empty())
+ PUDeletePopup(hWnd);
+ else {
+ bool closeflag = false;
+ processAction(left, closeflag);
+ if (closeflag)
PUDeletePopup(hWnd);
- else {
- bool closeflag = false;
- processAction(left, closeflag);
- if (closeflag)
- PUDeletePopup(hWnd);
- }
}
+ }
return TRUE;
case WM_CONTEXTMENU:
- {
- EnterCS(&g_popups_cs);
- std::string right;
- if (pd)
- right = pd->right;
- LeaveCS(&g_popups_cs);
+ {
+ EnterCS(&g_popups_cs);
+ std::string right;
+ if (pd)
+ right = pd->right;
+ LeaveCS(&g_popups_cs);
- if (right.empty())
+ if (right.empty())
+ PUDeletePopup(hWnd);
+ else {
+ bool closeflag = false;
+ processAction(right, closeflag);
+ if (closeflag)
PUDeletePopup(hWnd);
- else {
- bool closeflag = false;
- processAction(right, closeflag);
- if (closeflag)
- PUDeletePopup(hWnd);
- }
}
+ }
return TRUE;
case UM_INITPOPUP:
@@ -534,7 +518,7 @@ int showMessage(const popup_t &msg) ppd.colorBack = msg.background;
ppd.colorText = msg.foreground;
ppd.lchIcon = getIcon(msg.icon);
- ppd.PluginWindowProc = (WNDPROC) PopupDlgProc;
+ ppd.PluginWindowProc = (WNDPROC)PopupDlgProc;
ppd.iSeconds = msg.delay;
EnterCS(&g_popups_cs);
@@ -605,23 +589,25 @@ inline int dehex(int c) { COLORREF parseColor(const std::string &buf, bool &ok)
{
ok = false;
- for (int i=0; i!=buf.size(); ++i)
+ for (int i = 0; i != buf.size(); ++i)
if (!isxdigit(buf[i]))
- return RGB(0,0,0);
+ return RGB(0, 0, 0);
if (buf.size() == 6) {
int r = (dehex(buf[0]) << 4) + dehex(buf[1]);
int g = (dehex(buf[2]) << 4) + dehex(buf[3]);
int b = (dehex(buf[4]) << 4) + dehex(buf[5]);
ok = true;
- return RGB(r,g,b);
- } else if (buf.size() == 3) {
- int r = dehex(buf[0])*17;
- int g = dehex(buf[1])*17;
- int b = dehex(buf[2])*17;
+ return RGB(r, g, b);
+ }
+ else if (buf.size() == 3) {
+ int r = dehex(buf[0]) * 17;
+ int g = dehex(buf[1]) * 17;
+ int b = dehex(buf[2]) * 17;
ok = true;
- return RGB(r,g,b);
- } else
- return RGB(0,0,0);
+ return RGB(r, g, b);
+ }
+ else
+ return RGB(0, 0, 0);
}
void loadDefaults(popup_t &msg, char ch)
@@ -632,16 +618,16 @@ void loadDefaults(popup_t &msg, char ch) switch (ch) {
case '%':
msg.icon = "message";
- msg.background = RGB(173,206,247);
- msg.foreground = RGB(0,0,0);
+ msg.background = RGB(173, 206, 247);
+ msg.foreground = RGB(0, 0, 0);
msg.contact = "Message";
msg.beep = true;
msg.sound = "Message";
return;
case '!':
msg.icon = "exclamation";
- msg.background = RGB(191,0,0);
- msg.foreground = RGB(255,245,225);
+ msg.background = RGB(191, 0, 0);
+ msg.foreground = RGB(255, 245, 225);
msg.contact = "Error";
msg.beep = true;
msg.sound = "Error";
@@ -649,8 +635,8 @@ void loadDefaults(popup_t &msg, char ch) case ' ':
default:
msg.icon = "information";
- msg.background = RGB(255,245,225);
- msg.foreground = RGB(0,0,0);
+ msg.background = RGB(255, 245, 225);
+ msg.foreground = RGB(0, 0, 0);
msg.contact = "Notice";
msg.beep = true;
msg.sound = "Notice";
@@ -665,7 +651,7 @@ bool parseSimpleMessage(const std::string &buf, popup_t &msg, char sep) msg.message = buf;
else {
msg.contact.assign(buf, 0, p);
- msg.message.assign(buf, p+1, buf.npos);
+ msg.message.assign(buf, p + 1, buf.npos);
}
return true;
}
@@ -692,17 +678,18 @@ bool parseComplexMessage(const std::string &buf, popup_t &msg, char sep) std::string what(p, wend);
std::string arg;
if (wend == cpos && wend && npos)
- arg.assign(cpos+1, npos);
+ arg.assign(cpos + 1, npos);
else if (!cpos)
arg.erase();
else
- arg = cpos+1;
+ arg = cpos + 1;
if (!g_settings.password.empty() && !passok) {
if (what == "passwd" && arg == g_settings.password) {
passok = true;
continue;
- } else
+ }
+ else
return false;
}
@@ -714,13 +701,15 @@ bool parseComplexMessage(const std::string &buf, popup_t &msg, char sep) if (!cpos) {
dbg_msg(Translate("No argument given to msg option."), SM_WARNING);
return false;
- } else if (msg.replace != xno && msg.id.empty()) {
+ }
+ else if (msg.replace != xno && msg.id.empty()) {
dbg_msg(Translate("ID is required for replacement."), SM_WARNING);
return false;
}
msg.message = arg;
return true;
- } else if (what == "replace") {
+ }
+ else if (what == "replace") {
if (arg == "yes")
msg.replace = xreplace;
else if (arg == "append")
@@ -731,7 +720,8 @@ bool parseComplexMessage(const std::string &buf, popup_t &msg, char sep) msg.replace = xno;
else
dbg_msg(Translate("Invalid argument for replace option: ") + arg, SM_WARNING);
- } else if (what == "sound") {
+ }
+ else if (what == "sound") {
if (arg.empty())
msg.beep = false;
else {
@@ -739,43 +729,54 @@ bool parseComplexMessage(const std::string &buf, popup_t &msg, char sep) msg.sound = arg;
registerSound(arg);
}
- } else if (what == "left") {
+ }
+ else if (what == "left") {
msg.left = arg;
- } else if (what == "right") {
+ }
+ else if (what == "right") {
msg.right = arg;
- } else if (what == "opened") {
+ }
+ else if (what == "opened") {
msg.opened = arg;
- } else if (what == "closed") {
+ }
+ else if (what == "closed") {
msg.closed = arg;
- } else if (what == "delay") {
+ }
+ else if (what == "delay") {
msg.delay = atoi(arg.c_str());
- } else if (what == "id") {
+ }
+ else if (what == "id") {
msg.id = arg;
- } else if (what == "bg") {
+ }
+ else if (what == "bg") {
bool ok;
msg.background = parseColor(arg, ok);
if (!ok)
dbg_msg("Invalid color: " + arg, SM_WARNING);
- } else if (what == "fg") {
+ }
+ else if (what == "fg") {
bool ok;
msg.foreground = parseColor(arg, ok);
if (!ok)
dbg_msg("Invalid color: " + arg, SM_WARNING);
- } else if (what == "from")
+ }
+ else if (what == "from")
msg.contact = arg;
else if (what == "sep") {
if (arg.size() == 1)
sep = arg[0];
else
dbg_msg("Invalid argument for sep option: " + arg, SM_WARNING);
- } else if (what == "beep") {
+ }
+ else if (what == "beep") {
if (arg == "1")
msg.beep = true;
else if (arg == "0")
msg.beep = false;
else
dbg_msg("Invalid argument for beep option: " + arg, SM_WARNING);
- } else
+ }
+ else
dbg_msg("Unknown option: " + what, SM_NOTIFY);
}
return true;
@@ -799,7 +800,8 @@ bool parseMessage(const std::string &abuf, popup_t &msg) if (buf.size() < 2) return false;
loadDefaults(msg, buf[0]);
buf.erase(0, 1);
- } else
+ }
+ else
loadDefaults(msg, ' ');
if (buf[0] == sep)
@@ -812,24 +814,20 @@ bool parseMessage(const std::string &abuf, popup_t &msg) void processMessage(std::string buf)
{
- if (IsLogService){
- logservice_log(LOG_ID, NULL, (TCHAR *) buf.c_str());
- }
- else {
- if (g_settings.log_to_file) {
- time_t t_;
- time(&t_);
- tm *t = localtime(&t_);
- FILE *f = fopen(g_settings.log_filename.c_str(), "a");
- if (f) {
- bool err = fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i] %s\n",
- int(t->tm_year+1900), int(t->tm_mon+1), int(t->tm_mday),
- int(t->tm_hour), int(t->tm_min), int(t->tm_sec), buf.c_str()) < 0;
- if (fclose(f) == EOF || err)
- dbg_msg(Translate("Failed to write to log file."), SM_WARNING);
- } else
- dbg_msg(Translate("Failed to open log file."), SM_WARNING);
+ if (g_settings.log_to_file) {
+ time_t t_;
+ time(&t_);
+ tm *t = localtime(&t_);
+ FILE *f = fopen(g_settings.log_filename.c_str(), "a");
+ if (f) {
+ bool err = fprintf(f, "[%04i-%02i-%02i %02i:%02i:%02i] %s\n",
+ int(t->tm_year + 1900), int(t->tm_mon + 1), int(t->tm_mday),
+ int(t->tm_hour), int(t->tm_min), int(t->tm_sec), buf.c_str()) < 0;
+ if (fclose(f) == EOF || err)
+ dbg_msg(Translate("Failed to write to log file."), SM_WARNING);
}
+ else
+ dbg_msg(Translate("Failed to open log file."), SM_WARNING);
}
popup_t msg;
@@ -925,7 +923,8 @@ DWORD udptcpThreadFunc(LPVOID useUdp) if (err > 0)
processMessage(buf);
}
- } else {
+ }
+ else {
listen(sock, SOMAXCONN);
while (!g_exit_threads) {
int fromSize = sizeof from;
@@ -944,7 +943,8 @@ DWORD udptcpThreadFunc(LPVOID useUdp) if (err < 0) {
totalbuf.clear();
break;
- } else if (err == 0)
+ }
+ else if (err == 0)
break;
else {
totallen += err;
@@ -974,7 +974,8 @@ DWORD udptcpThreadFunc(LPVOID useUdp) t += Translate("N/A: FormatMessage failed, error code was 0x");
char tbuf[10];
t += itoa(ec, tbuf, 16);
- } else
+ }
+ else
t += buf;
MessageBoxA(0, t.c_str(), Translate("Error"), MB_OK);
@@ -986,10 +987,10 @@ void start_threads() {
g_exit_threads = false;
DWORD id;
- g_udp_thread = CreateThread(NULL, 0,
- (LPTHREAD_START_ROUTINE) udptcpThreadFunc, (LPVOID) 1, 0, &id);
- g_tcp_thread = CreateThread(NULL, 0,
- (LPTHREAD_START_ROUTINE) udptcpThreadFunc, NULL, 0, &id);
+ g_udp_thread = CreateThread(NULL, 0,
+ (LPTHREAD_START_ROUTINE)udptcpThreadFunc, (LPVOID)1, 0, &id);
+ g_tcp_thread = CreateThread(NULL, 0,
+ (LPTHREAD_START_ROUTINE)udptcpThreadFunc, NULL, 0, &id);
}
void stop_threads()
@@ -1003,17 +1004,13 @@ void stop_threads() WaitForSingleObject(g_tcp_thread, INFINITE);
}
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
int ModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- IsLogService = ServiceExists(MS_LOGSERVICE_REGISTER) != 0;
- if (IsLogService)
- logservice_register(LOG_ID, LPGENT(LOG_ID), NULL, NULL);
-
return 0;
}
@@ -1022,7 +1019,7 @@ extern "C" int __declspec(dllexport) Load() g_firstrun = true;
mir_getLP(&pluginInfo);
- char buf[MAX_PATH+1];
+ char buf[MAX_PATH + 1];
strcpy(buf, ".");
g_mirandaDir = getcwd(buf, MAX_PATH);
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index 69468f95e5..47cdaeecf6 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -11,30 +11,8 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara char buf[10];
CheckDlgButton(hwndDlg, NA_LOCAL_CHECK, g_settings.local_only ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, NA_DEBUG_MSG_CHECK, g_settings.debug_messages ? BST_CHECKED : BST_UNCHECKED);
- if (IsLogService) {
- LS_LOGINFO pli;
- pli.szID = LOG_ID;
- pli.hContact = NULL;
- pli.szLogPath = NULL;
- pli.Flags = 0;
- pli.cbSize = sizeof(LS_LOGINFO);
- if (!CallService(MS_LOGSERVICE_GETLOGINFO, (WPARAM)(LS_LOGINFO *) &pli, 0)) {
- CheckDlgButton(hwndDlg, NA_LOG_CHECK, (pli.Flags && LSLI_LOGENABLED) ? BST_CHECKED : BST_UNCHECKED);
- }
- std::tstring InLogService = TranslateT("Services");
- InLogService += _T(" -> ");
- InLogService += TranslateT("LogService");
- InLogService += _T(" -> ");
- InLogService += TranslateT(LOG_ID);
- SetDlgItemText(hwndDlg, NA_LOG_FILENAME, InLogService.c_str());
- }
- else {
- CheckDlgButton(hwndDlg, NA_LOG_CHECK, g_settings.log_to_file ? BST_CHECKED : BST_UNCHECKED);
- SetDlgItemTextA(hwndDlg, NA_LOG_FILENAME, g_settings.log_filename.c_str());
- }
- EnableWindow(GetDlgItem(hwndDlg, NA_LOG_CHECK), !IsLogService);
- EnableWindow(GetDlgItem(hwndDlg, NA_LOG_FILENAME), !IsLogService);
- EnableWindow(GetDlgItem(hwndDlg, NA_LOG_BROWSE), !IsLogService);
+ CheckDlgButton(hwndDlg, NA_LOG_CHECK, g_settings.log_to_file ? BST_CHECKED : BST_UNCHECKED);
+ SetDlgItemTextA(hwndDlg, NA_LOG_FILENAME, g_settings.log_filename.c_str());
EnableWindow(GetDlgItem(hwndDlg, NA_DEBUG_MSG_CHECK), IsDlgButtonChecked(hwndDlg, NA_LOG_CHECK) ? 1 : 0);
CheckDlgButton(hwndDlg, NA_PCSPEAKER_CHECK, g_settings.use_pcspeaker ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, NA_ALLOW_EXECUTE, g_settings.allow_execute ? BST_CHECKED : BST_UNCHECKED);
@@ -134,12 +112,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara buf[0] = '\0';
s.password = _T2A(buf);
- if (!IsLogService) {
- if (!GetDlgItemText(hwndDlg, NA_LOG_FILENAME, buf, sizeof buf - 1))
- buf[0] = '\0';
- s.log_filename = _T2A(buf);
- }
-
g_settings = s;
save_settings();
stop_threads();
diff --git a/plugins/QuickContacts/res/resource.rc b/plugins/QuickContacts/res/resource.rc index 0f173ee773..75b589855f 100644 --- a/plugins/QuickContacts/res/resource.rc +++ b/plugins/QuickContacts/res/resource.rc @@ -73,7 +73,6 @@ BEGIN 176,11
CONTROL "",IDC_MESSAGE,"MButtonClass",0x0,41,36,17,15,
0x18000000L
- CONTROL "",IDC_VOICE,"MButtonClass",0x0,62,36,17,15,0x18000000L
CONTROL "",IDC_FILE,"MButtonClass",0x0,83,36,17,15,0x18000000L
CONTROL "",IDC_URL,"MButtonClass",0x0,104,36,17,15,0x18000000L
CONTROL "",IDC_USERINFO,"MButtonClass",0x0,125,36,17,15,
@@ -119,7 +118,6 @@ BEGIN "I", HOTKEY_INFO, VIRTKEY, CONTROL, NOINVERT
"M", HOTKEY_MENU, VIRTKEY, CONTROL, NOINVERT
"U", HOTKEY_URL, VIRTKEY, CONTROL, NOINVERT
- "V", HOTKEY_VOICE, VIRTKEY, CONTROL, NOINVERT
END
#ifdef APSTUDIO_INVOKED
diff --git a/plugins/QuickContacts/src/commons.h b/plugins/QuickContacts/src/commons.h index b9c41b88e9..ab0397762f 100644 --- a/plugins/QuickContacts/src/commons.h +++ b/plugins/QuickContacts/src/commons.h @@ -44,7 +44,6 @@ Boston, MA 02111-1307, USA. #include <win2k.h>
#include <m_metacontacts.h>
-#include <m_voiceservice.h>
#include <m_quickcontacts.h>
#include "../utils/mir_options.h"
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 6cd7065ba3..fe69dea394 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -132,12 +132,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) hkd.pszService = NULL;
- hkd.lParam = HOTKEY_VOICE;
- hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'V');
- hkd.pszName = "Quick Contacts/Voice";
- hkd.ptszDescription = LPGENT("Make a voice call");
- Hotkey_Register(&hkd);
-
hkd.lParam = HOTKEY_FILE;
hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'F');
hkd.pszName = "Quick Contacts/File";
@@ -443,7 +437,6 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact) if (hContact == NULL)
{
EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_VOICE), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_URL), FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), FALSE);
@@ -466,11 +459,7 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact) if (pszProto != NULL)
caps = CallProtoService(pszProto, PS_GETCAPS, PFLAGNUM_1, 0);
- BOOL voice = (ServiceExists(MS_VOICESERVICE_CAN_CALL)
- && CallService(MS_VOICESERVICE_CAN_CALL, hContact, 0) > 0);
-
EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), caps & PF1_IMSEND ? TRUE : FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_VOICE), voice);
EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), caps & PF1_FILESEND ? TRUE : FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_URL), caps & PF1_URLSEND ? TRUE : FALSE);
EnableWindow(GetDlgItem(hwndDlg, IDC_USERINFO), TRUE);
@@ -770,17 +759,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA // Buttons
FillCheckbox(hwndDlg, IDC_SHOW_ALL_CONTACTS, LPGENT("Show all contacts"), hasNewHotkeyModule ? NULL : _T("Ctrl+A"));
FillButton(hwndDlg, IDC_MESSAGE, LPGENT("Send message"), NULL, LoadSkinnedIcon(SKINICON_EVENT_MESSAGE));
-
- if (ServiceExists(MS_VOICESERVICE_CAN_CALL))
- FillButton(hwndDlg, IDC_VOICE, LPGENT("Make a voice call"), hasNewHotkeyModule ? NULL : _T("Ctrl+V"), Skin_GetIcon("vca_call"));
- else
- {
- GetWindowRect(GetDlgItem(hwndDlg, IDC_VOICE), &rc);
- ScreenToClient(hwndDlg, &rc);
- MoveWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), rc, FALSE);
- ShowWindow(GetDlgItem(hwndDlg, IDC_VOICE), SW_HIDE);
- }
-
FillButton(hwndDlg, IDC_FILE, LPGENT("Send file"), hasNewHotkeyModule ? NULL : _T("Ctrl+F"), LoadSkinnedIcon(SKINICON_EVENT_FILE));
FillButton(hwndDlg, IDC_URL, LPGENT("Send URL"), hasNewHotkeyModule ? NULL : _T("Ctrl+U"), LoadSkinnedIcon(SKINICON_EVENT_URL));
FillButton(hwndDlg, IDC_USERINFO, LPGENT("Open user info"), hasNewHotkeyModule ? NULL : _T("Ctrl+I"), LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS));
@@ -848,30 +826,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage(hwndDlg, WM_CLOSE, 0, 0);
break;
}
- case HOTKEY_VOICE:
- case IDC_VOICE:
- {
- MCONTACT hContact = GetSelectedContact(hwndDlg);
- if (hContact == NULL)
- {
- SetDlgItemText(hwndDlg, IDC_USERNAME, _T(""));
- SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME));
- break;
- }
-
- // Is button enabled?
- if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_VOICE)))
- break;
-
- if (!ServiceExists(MS_VOICESERVICE_CALL))
- break;
-
- CallService(MS_VOICESERVICE_CALL, (WPARAM) hContact, 0);
-
- db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);
- SendMessage(hwndDlg, WM_CLOSE, 0, 0);
- }
- break;
case HOTKEY_FILE:
case IDC_FILE:
diff --git a/plugins/QuickContacts/src/resource.h b/plugins/QuickContacts/src/resource.h index f7f6a0142f..38fd6df5cb 100644 --- a/plugins/QuickContacts/src/resource.h +++ b/plugins/QuickContacts/src/resource.h @@ -23,15 +23,12 @@ #define IDC_USERINFO 1065
#define IDC_HISTORY 1066
#define IDC_MENU 1067
-#define IDC_VOICE 1068
#define HOTKEY_FILE 40001
#define HOTKEY_URL 40002
#define HOTKEY_INFO 40003
#define HOTKEY_HISTORY 40004
#define HOTKEY_ALL_CONTACTS 40005
#define HOTKEY_MENU 40006
-#define HOTKEY_VOICE 40007
-#define IDC_STATIC -1
// Next default values for new objects
//
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 81442e02e1..17b43b5381 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -446,9 +446,5 @@ int LoadAwayMsgModule(void) HookEvent(ME_CLIST_PREBUILDCONTACTMENU, AwayMsgPreBuildMenu);
- // Deprecated SimpleAway services
- CreateServiceFunction(MS_SA_COPYAWAYMSG, CopyAwayMsgCommand);
- CreateServiceFunction(MS_SA_GOTOURLMSG, GoToURLMsgCommand);
-
return 0;
}
diff --git a/plugins/SimpleStatusMsg/src/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h index 30b7b51e82..b709b87837 100644 --- a/plugins/SimpleStatusMsg/src/commonheaders.h +++ b/plugins/SimpleStatusMsg/src/commonheaders.h @@ -42,7 +42,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <m_statusplugins.h>
#include <m_toptoolbar.h>
#include <m_variables.h>
-#include <m_simpleaway.h>
#include <m_simplestatusmsg.h>
#include "simplestatusmsg.h"
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 530c769fa2..4e9ff62d91 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1184,66 +1184,6 @@ static INT_PTR ChangeStatusMsg(WPARAM wParam, LPARAM lParam) return 0;
}
-static INT_PTR SetOfflineStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_OFFLINE, 0);
- return 0;
-}
-
-static INT_PTR SetOnlineStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_ONLINE, 0);
- return 0;
-}
-
-static INT_PTR SetAwayStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_AWAY, 0);
- return 0;
-}
-
-static INT_PTR SetDNDStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_DND, 0);
- return 0;
-}
-
-static INT_PTR SetNAStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_NA, 0);
- return 0;
-}
-
-static INT_PTR SetOccupiedStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_OCCUPIED, 0);
- return 0;
-}
-
-static INT_PTR SetFreeChatStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_FREECHAT, 0);
- return 0;
-}
-
-static INT_PTR SetInvisibleStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_INVISIBLE, 0);
- return 0;
-}
-
-static INT_PTR SetOnThePhoneStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_ONTHEPHONE, 0);
- return 0;
-}
-
-static INT_PTR SetOutToLunchStatus(WPARAM wParam, LPARAM lParam)
-{
- ChangeStatusMessage((WPARAM)ID_STATUS_OUTTOLUNCH, 0);
- return 0;
-}
-
static int ProcessProtoAck(WPARAM wParam,LPARAM lParam)
{
ACKDATA *ack = (ACKDATA *)lParam;
@@ -1965,11 +1905,6 @@ static int OnPreShutdown(WPARAM wParam, LPARAM lParam) return 0;
}
-static INT_PTR IsSARunning(WPARAM wParam, LPARAM lParam)
-{
- return 1;
-}
-
//remember to mir_free() the return value
static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam)
{
@@ -1995,24 +1930,6 @@ extern "C" int __declspec(dllexport) Load(void) CreateServiceFunction(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, ChangeStatusMsg);
CreateServiceFunction(MS_SIMPLESTATUSMSG_SHOWDIALOGINT, ShowStatusMessageDialogInternal); // internal use ONLY
- // Deprecated SimpleAway services
- CreateServiceFunction(MS_SA_ISSARUNNING, IsSARunning);
- CreateServiceFunction(MS_SA_CHANGESTATUSMSG, ChangeStatusMsg);
- CreateServiceFunction(MS_SA_TTCHANGESTATUSMSG, ShowStatusMessageDialogInternal);
- CreateServiceFunction(MS_SA_SHOWSTATUSMSGDIALOG, ShowStatusMessageDialog);
- CreateServiceFunction(MS_SA_SETSTATUSMODE, SetStatusModeFromExtern);
-
- CreateServiceFunction(MS_SA_SETOFFLINESTATUS, SetOfflineStatus);
- CreateServiceFunction(MS_SA_SETONLINESTATUS, SetOnlineStatus);
- CreateServiceFunction(MS_SA_SETAWAYSTATUS, SetAwayStatus);
- CreateServiceFunction(MS_SA_SETDNDSTATUS, SetDNDStatus);
- CreateServiceFunction(MS_SA_SETNASTATUS, SetNAStatus);
- CreateServiceFunction(MS_SA_SETOCCUPIEDSTATUS, SetOccupiedStatus);
- CreateServiceFunction(MS_SA_SETFREECHATSTATUS, SetFreeChatStatus);
- CreateServiceFunction(MS_SA_SETINVISIBLESTATUS, SetInvisibleStatus);
- CreateServiceFunction(MS_SA_SETONTHEPHONESTATUS, SetOnThePhoneStatus);
- CreateServiceFunction(MS_SA_SETOUTTOLUNCHSTATUS, SetOutToLunchStatus);
-
HookEvent(ME_SYSTEM_OKTOEXIT, OnOkToExit);
HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
diff --git a/plugins/SimpleStatusMsg/src/simplestatusmsg.h b/plugins/SimpleStatusMsg/src/simplestatusmsg.h index f78f04dcbc..c1ca255b19 100644 --- a/plugins/SimpleStatusMsg/src/simplestatusmsg.h +++ b/plugins/SimpleStatusMsg/src/simplestatusmsg.h @@ -34,6 +34,9 @@ PROTOACCOUNTS; extern PROTOACCOUNTS *accounts;
+// Represents status that a protocol(s) is/are currently in
+#define ID_STATUS_CURRENT 40082
+
#define DLG_SHOW_STATUS 1
#define DLG_SHOW_STATUS_ICONS 2
#define DLG_SHOW_LIST_ICONS 4
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index a44ad92343..e4ed409e68 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -76,7 +76,6 @@ using namespace std; #include <m_extraicons.h>
#include <m_avatars.h>
#include <m_contacts.h>
-#include <m_db3xSA.h>
#include <m_icolib.h>
#include <m_string.h>
#include <m_popup.h>
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index 6dab5f380d..0d59af26ec 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -211,13 +211,6 @@ static void GetInitialDir(LPSTR pszInitialDir) if (!PathToAbsolute(szRelative, pszInitialDir))
strcpy(pszInitialDir, szRelative);
}
- else if (//try to use environment variables supported by pathpatch of db3xSA
- !ServiceExists(MS_DB_GETPROFILEPATH_BASIC) ||
- !PathToAbsolute(PROFILEPATH "\\" PROFILENAME, pszInitialDir)) {
- // use standard path to absolute
- if ( !PathToAbsolute("", pszInitialDir))
- *pszInitialDir = 0;
- }
else *pszInitialDir = 0;
}
|