diff options
28 files changed, 13 insertions, 256 deletions
diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc index b7d3ddb00b..df8161a615 100644 --- a/include/delphi/m_database.inc +++ b/include/delphi/m_database.inc @@ -31,7 +31,6 @@ const const
EVENTTYPE_MESSAGE = 0;
- EVENTTYPE_URL = 1;
EVENTTYPE_CONTACTS = 2; // v0.1.2.2+
EVENTTYPE_ADDED = 1000; // v0.1.1.0+: these used to be module-
EVENTTYPE_AUTHREQUEST = 1001; // specific codes, hence the module-
diff --git a/include/m_import.h b/include/m_import.h index 8bed3157e4..385fc94403 100644 --- a/include/m_import.h +++ b/include/m_import.h @@ -32,8 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define IOPT_ADDUNKNOWN 0x00000001 #define IOPT_MSGSENT 0x00000002 #define IOPT_MSGRECV 0x00000004 -#define IOPT_URLSENT 0x00000008 -#define IOPT_URLRECV 0x00000010 #define IOPT_AUTHREQ 0x00000020 #define IOPT_ADDED 0x00000040 #define IOPT_FILESENT 0x00000080 diff --git a/plugins/ExternalAPI/delphi/m_ieview.inc b/plugins/ExternalAPI/delphi/m_ieview.inc index 72de71299b..0b71e99ad0 100644 --- a/plugins/ExternalAPI/delphi/m_ieview.inc +++ b/plugins/ExternalAPI/delphi/m_ieview.inc @@ -78,7 +78,6 @@ const IEED_EVENT_MESSAGE = $0001; // message
IEED_EVENT_STATUSCHANGE = $0002; // status change
IEED_EVENT_FILE = $0003; // file
- IEED_EVENT_URL = $0004; // url
IEED_EVENT_ERRMSG = $0005; // error message
IEED_EVENT_SYSTEM = $0006; // system event
diff --git a/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas b/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas index fdfda0597a..393356a81d 100644 --- a/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas +++ b/plugins/HistoryPlusPlus/CustomizeFiltersForm.pas @@ -138,7 +138,7 @@ begin SetLength(LocalFilters,i+1);
LocalFilters[i].Name := NewName;
LocalFilters[i].filMode := FM_INCLUDE;
- LocalFilters[i].filEvents := [mtIncoming,mtOutgoing,mtMessage,mtUrl,mtFile];
+ LocalFilters[i].filEvents := [mtIncoming,mtOutgoing,mtMessage,mtFile];
LocalFilters[i].Events := GenerateEvents(LocalFilters[i].filMode,LocalFilters[i].filEvents);
lbFilters.Items.Add(NewName);
diff --git a/plugins/HistoryPlusPlus/HistoryForm.pas b/plugins/HistoryPlusPlus/HistoryForm.pas index e6a2fa7429..6a737a7b3e 100644 --- a/plugins/HistoryPlusPlus/HistoryForm.pas +++ b/plugins/HistoryPlusPlus/HistoryForm.pas @@ -2279,14 +2279,6 @@ begin else
Item.FileName := UTF8Encode(MakeTextXMLedA(tmp));
end
- else if mtUrl in hg.Items[Index].MessageType then
- begin
- tmp := hg.Items[Index].Extended;
- if tmp = '' then
- Item.Url := '&UNK;'
- else
- Item.Url := UTF8Encode(MakeTextXMLedA(tmp));
- end
else if mtAvatarChange in hg.Items[Index].MessageType then
begin
tmp := hg.Items[Index].Extended;
diff --git a/plugins/HistoryPlusPlus/hpp_eventfilters.pas b/plugins/HistoryPlusPlus/hpp_eventfilters.pas index 1c58e7da1e..2353701217 100644 --- a/plugins/HistoryPlusPlus/hpp_eventfilters.pas +++ b/plugins/HistoryPlusPlus/hpp_eventfilters.pas @@ -77,10 +77,9 @@ var filterAll: TMessageTypes;
const
- hppIntDefEventFilters: array[0..12] of ThppEventFilter = (
+ hppIntDefEventFilters: array[0..11] of ThppEventFilter = (
(Name: 'Show all events'; Events: []; filMode: FM_EXCLUDE; filEvents: []),
(Name: 'Messages'; Events: []; filMode: FM_INCLUDE; filEvents: [mtMessage,mtIncoming,mtOutgoing]),
- (Name: 'Link URLs'; Events: []; filMode: FM_INCLUDE; filEvents: [mtUrl,mtIncoming,mtOutgoing]),
(Name: 'Files'; Events: []; filMode: FM_INCLUDE; filEvents: [mtFile,mtIncoming,mtOutgoing]),
(Name: 'Contacts'; Events: []; filMode: FM_INCLUDE; filEvents: [mtContacts,mtIncoming,mtOutgoing]),
(Name: 'Status changes'; Events: []; filMode: FM_INCLUDE; filEvents: [mtStatus,mtIncoming,mtOutgoing]),
diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 84e21102f4..4ade13228a 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -72,7 +72,6 @@ const (Name:'Incoming events'; XML:''; i:HPP_ICON_EVENT_INCOMING; iName:'hppevn_inc'; iSkin:-1),
(Name:'Outgoing events'; XML:''; i:HPP_ICON_EVENT_OUTGOING; iName:'hppevn_out'; iSkin:-1),
(Name:'Message'; XML:'MSG'; i:HPP_SKIN_EVENT_MESSAGE; iSkin:SKINICON_EVENT_MESSAGE),
- (Name:'Link'; XML:'URL'; i:HPP_SKIN_EVENT_URL; iSkin:SKINICON_EVENT_URL),
(Name:'File transfer'; XML:'FILE'; i:HPP_SKIN_EVENT_FILE; iSkin:SKINICON_EVENT_FILE),
(Name:'System message'; XML:'SYS'; i:HPP_ICON_EVENT_SYSTEM; iName:'hppevn_sys'; iSkin:-1),
(Name:'Contacts'; XML:'ICQCNT'; i:HPP_ICON_EVENT_CONTACTS; iName:'hppevn_icqcnt'; iSkin:-1),
@@ -115,7 +114,6 @@ function GetEventCoreText(EventInfo: TDBEventInfo; var Hi: THistoryItem): Boolea // specific routines
procedure GetEventTextForMessage(EventInfo: TDBEventInfo; var Hi: THistoryItem);
procedure GetEventTextForFile(EventInfo: TDBEventInfo; var Hi: THistoryItem);
-procedure GetEventTextForUrl(EventInfo: TDBEventInfo; var Hi: THistoryItem);
procedure GetEventTextForAuthRequest(EventInfo: TDBEventInfo; var Hi: THistoryItem);
procedure GetEventTextForYouWereAdded(EventInfo: TDBEventInfo; var Hi: THistoryItem);
procedure GetEventTextForSms(EventInfo: TDBEventInfo; var Hi: THistoryItem);
@@ -185,13 +183,12 @@ type end;
var
- EventTable: array[0..28] of TEventTableItem = (
+ EventTable: array[0..27] of TEventTableItem = (
// must be the first item in array for unknown events
(EventType: MaxWord; MessageType: mtOther; TextFunction: GetEventTextForOther),
// events definitions
(EventType: EVENTTYPE_MESSAGE; MessageType: mtMessage; TextFunction: GetEventTextForMessage),
(EventType: EVENTTYPE_FILE; MessageType: mtFile; TextFunction: GetEventTextForFile),
- (EventType: EVENTTYPE_URL; MessageType: mtUrl; TextFunction: GetEventTextForUrl),
(EventType: EVENTTYPE_AUTHREQUEST; MessageType: mtSystem; TextFunction: GetEventTextForAuthRequest),
(EventType: EVENTTYPE_ADDED; MessageType: mtSystem; TextFunction: GetEventTextForYouWereAdded),
(EventType: EVENTTYPE_CONTACTS; MessageType: mtContacts; TextFunction: GetEventTextForContacts),
@@ -379,48 +376,6 @@ begin end;
end;
-function TextHasUrls(var Text: String): Boolean;
-var
- i,len,lenW: Integer;
- pText,pPos: PChar;
-begin
- Result := False;
- len := Length(Text);
- if len=0 then exit;
-
- pText := PChar(Text);
- for i := 0 to High(UrlPrefix) do
- begin
- pPos := StrPos(pText, PChar(UrlPrefix[i]));
- if not Assigned(pPos) then
- continue;
- Result := ((uint_ptr(pPos) = uint_ptr(pText)) or not IsWideCharAlphaNumeric((pPos - 1)^)) and
- IsWideCharAlphaNumeric((pPos + Length(UrlPrefix[i]))^);
- if Result then
- exit;
- end;
-
- if not Assigned(StrPos(PChar(Text),':/')) then exit;
-
- lenW := (len+1)*SizeOf(Char);
-
- TextBuffer.Lock;
- TextBuffer.Allocate(lenW);
- Move(Text[1],TextBuffer.Buffer^,lenW);
- CharLowerBuffW(PChar(TextBuffer.Buffer),len);
- for i := 0 to High(UrlProto) do
- begin
- pPos := StrPos(PChar(TextBuffer.Buffer), PChar(UrlProto[i].proto));
- if not Assigned(pPos) then
- continue;
- Result := ((uint_ptr(pPos) = uint_ptr(TextBuffer.Buffer)) or
- not IsWideCharAlphaNumeric((pPos - 1)^));
- if Result then
- break;
- end;
- TextBuffer.Unlock;
-end;
-
function GetEventInfo(hDBEvent: THANDLE): TDBEventInfo;
var
BlobSize: integer;
@@ -488,12 +443,6 @@ begin EventTable[EventIndex].TextFunction(EventInfo, Result);
Result.Text := AdjustLineBreaks(Result.Text);
Result.Text := TrimRight(Result.Text);
- if mtMessage in Result.MessageType then
- if TextHasUrls(Result.Text) then
- begin
- exclude(Result.MessageType, mtMessage);
- include(Result.MessageType, mtUrl);
- end;
finally
EventBuffer.Unlock;
end;
@@ -579,23 +528,6 @@ begin end;
end;
-procedure GetEventTextForUrl(EventInfo: TDBEventInfo; var Hi: THistoryItem);
-var
- BytePos:LongWord;
- Url,Desc: AnsiString;
- cp: Cardinal;
-begin
- BytePos:=0;
- ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Url,BytePos);
- ReadStringTillZeroA(Pointer(EventInfo.pBlob),EventInfo.cbBlob,Desc,BytePos);
- if Boolean(EventInfo.flags and DBEF_UTF) then
- cp := CP_UTF8
- else
- cp := Hi.CodePage;
- hi.Text := Format(TranslateW('URL: %s'),[AnsiToWideString(url+#13#10+desc,cp)]);
- hi.Extended := Url;
-end;
-
procedure GetEventTextForFile(EventInfo: TDBEventInfo; var Hi: THistoryItem);
var
BytePos: LongWord;
diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas index c97891746d..9bb7190c38 100644 --- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas +++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas @@ -534,7 +534,7 @@ begin // tabSRMM still doesn't marks events read in case of hpp log is in use...
// if (FGridMode = gmIEView) and
if (mtIncoming in Item.MessageType) and (MessageTypesToDWord(Item.MessageType) and
- MessageTypesToDWord([mtMessage, mtUrl]) > 0) then
+ MessageTypesToDWord([mtMessage]) > 0) then
begin
if (not Item.IsRead) then
db_event_markRead(Items[Index].hContact, Items[Index].hDBEvent);
@@ -1197,14 +1197,6 @@ begin else
Item.FileName := UTF8Encode(MakeTextXMLedA(tmp));
end
- else if mtUrl in Grid.Items[Index].MessageType then
- begin
- tmp := Grid.Items[Index].Extended;
- if tmp = '' then
- Item.Url := '&UNK;'
- else
- Item.Url := UTF8Encode(MakeTextXMLedA(tmp));
- end
else if mtAvatarChange in Grid.Items[Index].MessageType then
begin
tmp := Grid.Items[Index].Extended;
diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas index f9f198da2a..3d2c44f32b 100644 --- a/plugins/HistoryPlusPlus/hpp_global.pas +++ b/plugins/HistoryPlusPlus/hpp_global.pas @@ -63,7 +63,7 @@ type // be show as the last entry
TMessageType = (mtUnknown,
mtIncoming, mtOutgoing,
- mtMessage, mtUrl, mtFile, mtSystem,
+ mtMessage, mtFile, mtSystem,
mtContacts, mtSMS, mtWebPager, mtEmailExpress, mtStatus, mtSMTPSimple,
mtOther,
mtNickChange,mtAvatarChange,mtWATrack,mtStatusMessage,mtVoiceCall,mtCustom);
diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas index d8a442a711..cd072da153 100644 --- a/plugins/HistoryPlusPlus/hpp_options.pas +++ b/plugins/HistoryPlusPlus/hpp_options.pas @@ -157,10 +157,10 @@ const Mes: [mtFile,mtOutgoing]; style:0; size: -11; color: $000000; back: $9BEEE3),
(_type: [hppFont,hppColor]; name: 'Incoming url';
- Mes: [mtUrl,mtIncoming]; style:0; size: -11; color: $000000; back: $F4D9CC),
+ Mes: [mtIncoming]; style:0; size: -11; color: $000000; back: $F4D9CC),
(_type: [hppFont,hppColor]; name: 'Outgoing url';
- Mes: [mtUrl,mtOutgoing]; style:0; size: -11; color: $000000; back: $F4D9CC),
+ Mes: [mtOutgoing]; style:0; size: -11; color: $000000; back: $F4D9CC),
(_type: [hppFont,hppColor]; name: 'Incoming SMS Message';
Mes: [mtSMS,mtIncoming]; style:0; size: -11; color: $000000; back: $CFF4FE),
diff --git a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas index b9a9109bf1..5a57ca9cb4 100644 --- a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas +++ b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas @@ -116,10 +116,9 @@ function IsEventInSession(EventType: Word): boolean; implementation
const
- SessionEvents: array[0..3] of Word = (
+ SessionEvents: array[0..2] of Word = (
EVENTTYPE_MESSAGE,
EVENTTYPE_FILE,
- EVENTTYPE_URL,
EVENTTYPE_CONTACTS);
function IsEventInSession(EventType: Word): boolean;
diff --git a/plugins/Import/res/resource.rc b/plugins/Import/res/resource.rc index cb912d9a8d..85296295b4 100644 --- a/plugins/Import/res/resource.rc +++ b/plugins/Import/res/resource.rc @@ -113,17 +113,14 @@ BEGIN CTEXT "Incoming",IDC_INCOMING,2,34,86,10,SS_NOTIFY
CTEXT "Outgoing",IDC_OUTGOING,132,34,86,10,SS_NOTIFY
CONTROL "",IDC_IN_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,44,10,10
- CONTROL "",IDC_IN_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,56,10,10
CONTROL "",IDC_IN_FT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,68,10,10
CONTROL "",IDC_IN_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,80,10,10
CONTROL "",IDC_OUT_MSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,44,10,10
- CONTROL "",IDC_OUT_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,56,10,10
CONTROL "",IDC_OUT_FT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,68,10,10
CONTROL "",IDC_OUT_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,80,10,10
CONTROL "Only since:",IDC_SINCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,99,100,10
CONTROL "",IDC_DATETIMEPICKER,"SysDateTimePick32",DTS_RIGHTALIGN | WS_DISABLED | WS_TABSTOP,120,97,81,15
CTEXT "Messages",IDC_MSG,54,44,112,8,SS_NOTIFY
- CTEXT "URLs",IDC_URL,54,56,112,8,SS_NOTIFY
CTEXT "File Transfers",IDC_FT,54,68,112,8,SS_NOTIFY
CTEXT "Other",IDC_OTHER,54,80,112,8,SS_NOTIFY
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,93,222,1
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 9dea9f6815..39559cdf4a 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -240,8 +240,8 @@ void CMirandaOptionsPageDlg::OnNext() //=======================================================================================
// Advanced options dialog
-static const UINT InControls[] = { IDC_IN_MSG, IDC_IN_URL, IDC_IN_FT, IDC_IN_OTHER };
-static const UINT OutControls[] = { IDC_OUT_MSG, IDC_OUT_URL, IDC_OUT_FT, IDC_OUT_OTHER };
+static const UINT InControls[] = { IDC_IN_MSG, IDC_IN_FT, IDC_IN_OTHER };
+static const UINT OutControls[] = { IDC_OUT_MSG, IDC_OUT_FT, IDC_OUT_OTHER };
static const UINT SysControls[] = { IDC_CONTACTS, IDC_SYSTEM };
CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() :
@@ -250,7 +250,6 @@ CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() : chkFT(this, IDC_FT),
chkAll(this, IDC_ALL),
chkMsg(this, IDC_MSG),
- chkUrl(this, IDC_URL),
chkOther(this, IDC_OTHER),
chkSince(this, IDC_SINCE),
chkOutgoing(this, IDC_OUTGOING),
@@ -261,7 +260,6 @@ CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() : chkSince.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Since);
chkAll.OnChange = chkOutgoing.OnChange = chkIncoming.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_All);
chkMsg.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Msg);
- chkUrl.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Url);
chkFT.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_FT);
chkOther.OnChange = Callback(this, &CMirandaAdvOptionsPageDlg::onChange_Other);
}
@@ -297,8 +295,6 @@ void CMirandaAdvOptionsPageDlg::OnNext() // incoming
if (IsDlgButtonChecked(m_hwnd, IDC_IN_MSG))
g_iImportOptions |= IOPT_MSGRECV;
- if (IsDlgButtonChecked(m_hwnd, IDC_IN_URL))
- g_iImportOptions |= IOPT_URLRECV;
if (IsDlgButtonChecked(m_hwnd, IDC_IN_FT))
g_iImportOptions |= IOPT_FILERECV;
if (IsDlgButtonChecked(m_hwnd, IDC_IN_OTHER))
@@ -307,8 +303,6 @@ void CMirandaAdvOptionsPageDlg::OnNext() // outgoing
if (IsDlgButtonChecked(m_hwnd, IDC_OUT_MSG))
g_iImportOptions |= IOPT_MSGSENT;
- if (IsDlgButtonChecked(m_hwnd, IDC_OUT_URL))
- g_iImportOptions |= IOPT_URLSENT;
if (IsDlgButtonChecked(m_hwnd, IDC_OUT_FT))
g_iImportOptions |= IOPT_FILESENT;
if (IsDlgButtonChecked(m_hwnd, IDC_OUT_OTHER))
@@ -363,12 +357,6 @@ void CMirandaAdvOptionsPageDlg::onChange_Msg(CCtrlCheck*) CheckDlgButton(m_hwnd, IDC_OUT_MSG, IsDlgButtonChecked(m_hwnd, IDC_OUT_MSG) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
}
-void CMirandaAdvOptionsPageDlg::onChange_Url(CCtrlCheck*)
-{
- CheckDlgButton(m_hwnd, IDC_IN_URL, IsDlgButtonChecked(m_hwnd, IDC_IN_URL) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(m_hwnd, IDC_OUT_URL, IsDlgButtonChecked(m_hwnd, IDC_OUT_URL) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
-}
-
void CMirandaAdvOptionsPageDlg::onChange_FT(CCtrlCheck*)
{
CheckDlgButton(m_hwnd, IDC_IN_FT, IsDlgButtonChecked(m_hwnd, IDC_IN_FT) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED);
diff --git a/plugins/Import/src/resource.h b/plugins/Import/src/resource.h index 42ef6867ee..c3d12ea54d 100644 --- a/plugins/Import/src/resource.h +++ b/plugins/Import/src/resource.h @@ -40,17 +40,14 @@ #define IDC_SYSTEM 1026
#define IDC_SINCE 1027
#define IDC_IN_MSG 1028
-#define IDC_IN_URL 1029
#define IDC_OUT_FT 1030
#define IDC_OUT_MSG 1031
-#define IDC_OUT_URL 1032
#define IDC_IN_OTHER 1033
#define IDC_OUT_OTHER 1034
#define IDC_INCOMING 1035
#define IDC_OUTGOING 1036
#define IDC_ALL 1037
#define IDC_MSG 1038
-#define IDC_URL 1039
#define IDC_FT 1040
#define IDC_OPEN_FILE 1042
#define IDC_CHECK_DUPS 1043
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h index ec5e3cdd7c..415eed700a 100644 --- a/plugins/Import/src/stdafx.h +++ b/plugins/Import/src/stdafx.h @@ -162,7 +162,7 @@ public: class CMirandaAdvOptionsPageDlg : public CWizardPageDlg
{
CCtrlButton btnBack;
- CCtrlCheck chkSince, chkAll, chkOutgoing, chkIncoming, chkMsg, chkUrl, chkFT, chkOther;
+ CCtrlCheck chkSince, chkAll, chkOutgoing, chkIncoming, chkMsg, chkFT, chkOther;
public:
CMirandaAdvOptionsPageDlg();
@@ -175,7 +175,6 @@ public: void onChange_Since(CCtrlCheck*);
void onChange_All(CCtrlCheck*);
void onChange_Msg(CCtrlCheck*);
- void onChange_Url(CCtrlCheck*);
void onChange_FT(CCtrlCheck*);
void onChange_Other(CCtrlCheck*);
};
diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc index cf121394fc..38ce2ea85a 100644 --- a/plugins/KeyboardNotify/res/resources.rc +++ b/plugins/KeyboardNotify/res/resources.rc @@ -206,8 +206,6 @@ BEGIN LTEXT "The following events are being ignored:",IDC_STATIC,8,17,288,8
ICON "IDI_RECVMSG",IDC_MSGICON,12,178,21,20,SS_CENTERIMAGE
LTEXT "Ignore messages",IDC_STATIC,32,184,70,8,SS_NOPREFIX | SS_CENTERIMAGE
- ICON "IDI_URL",IDC_URLICON,12,198,21,20,SS_CENTERIMAGE
- LTEXT "Ignore URLs",IDC_STATIC,32,204,70,8,SS_NOPREFIX | SS_CENTERIMAGE
ICON "IDI_FILE",IDC_FILEICON,116,178,21,20,SS_CENTERIMAGE
LTEXT "Ignore files",IDC_STATIC,136,184,70,8,SS_NOPREFIX | SS_CENTERIMAGE
ICON "IDI_MIRANDA",IDC_OTHERICON,116,198,21,20,SS_CENTERIMAGE
diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp index 124ef7b51b..bf8f81bdcf 100644 --- a/plugins/KeyboardNotify/src/ignore.cpp +++ b/plugins/KeyboardNotify/src/ignore.cpp @@ -209,7 +209,6 @@ INT_PTR CALLBACK DlgProcIgnoreOptions(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPa SendDlgItemMessage(hwndDlg, IDC_ALLICON, STM_SETICON, (WPARAM)hIcons[0], 0);
SendDlgItemMessage(hwndDlg, IDC_NONEICON, STM_SETICON, (WPARAM)hIcons[1], 0);
SendDlgItemMessage(hwndDlg, IDC_MSGICON, STM_SETICON, (WPARAM)hIcons[2], 0);
- SendDlgItemMessage(hwndDlg, IDC_URLICON, STM_SETICON, (WPARAM)hIcons[3], 0);
SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETICON, (WPARAM)hIcons[4], 0);
SendDlgItemMessage(hwndDlg, IDC_OTHERICON, STM_SETICON, (WPARAM)hIcons[5], 0);
diff --git a/plugins/KeyboardNotify/src/resource.h b/plugins/KeyboardNotify/src/resource.h index 88fbe4c38c..78e99972b7 100644 --- a/plugins/KeyboardNotify/src/resource.h +++ b/plugins/KeyboardNotify/src/resource.h @@ -105,7 +105,6 @@ #define IDC_ALLICON 1208
#define IDC_NONEICON 1209
#define IDC_MSGICON 1375
-#define IDC_URLICON 1376
#define IDC_TABS 2000
// Next default values for new objects
diff --git a/plugins/MirandaG15/src/CEvent.h b/plugins/MirandaG15/src/CEvent.h index 4222600ca4..e7c683123d 100644 --- a/plugins/MirandaG15/src/CEvent.h +++ b/plugins/MirandaG15/src/CEvent.h @@ -7,7 +7,6 @@ enum EventType { EVENT_MSG_RECEIVED = 0, EVENT_STATUS = 1,
EVENT_MSG_ACK = 2,
- EVENT_URL = 5,
EVENT_FILE = 6,
EVENT_AUTHREQUEST = 7,
EVENT_CONTACTS = 8,
diff --git a/plugins/StatusChange/res/resource.rc b/plugins/StatusChange/res/resource.rc index 6e2580b089..9da9ba995f 100644 --- a/plugins/StatusChange/res/resource.rc +++ b/plugins/StatusChange/res/resource.rc @@ -33,8 +33,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
CONTROL "",IDC_CHK_MESSAGESEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,27,10,8
CONTROL "",IDC_CHK_MESSAGEREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,27,10,8
- CONTROL "",IDC_CHK_URLSEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,46,10,8
- CONTROL "",IDC_CHK_URLREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,46,10,8
CONTROL "",IDC_CHK_FILESEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,64,10,8
CONTROL "",IDC_CHK_FILEREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,64,10,8
CONTROL "Offline",IDC_RAD_OFFLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,101,95,10
@@ -61,12 +59,10 @@ BEGIN CTEXT "Send",-1,149,17,41,9,NOT WS_GROUP
CTEXT "Receive",-1,187,17,41,9,NOT WS_GROUP
LTEXT "Message",-1,73,27,85,8,NOT WS_GROUP
- LTEXT "URL",-1,73,46,85,8,NOT WS_GROUP
LTEXT "File transfer",-1,73,64,85,8,NOT WS_GROUP
GROUPBOX "...change status to...",-1,45,86,220,68,WS_GROUP
GROUPBOX "...if status is...",-1,45,163,220,68,WS_GROUP
ICON "",IDC_MSGICON,51,20,21,20,SS_CENTERIMAGE
- ICON "",IDC_URLICON,51,40,21,20,SS_CENTERIMAGE
ICON "",IDC_FILEICON,51,59,21,20,SS_CENTERIMAGE
END
diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index 926095c98b..16b81f6d24 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -2,7 +2,6 @@ TOPTIONS Options;
HICON hIconMsg;
-HICON hIconUrl;
HICON hIconFile;
CMPlugin g_plugin;
@@ -34,8 +33,6 @@ void LoadOptions() memset(&Options, 0, sizeof(Options));
Options.MessageRead = (BOOL)g_plugin.getByte("MessageRead", FALSE);
Options.MessageSend = (BOOL)g_plugin.getByte("MessageSend", TRUE);
- Options.UrlRead = (BOOL)g_plugin.getByte("UrlRead", FALSE);
- Options.UrlSend = (BOOL)g_plugin.getByte("UrlSend", TRUE);
Options.FileRead = (BOOL)g_plugin.getByte("FileRead", FALSE);
Options.FileSend = (BOOL)g_plugin.getByte("FileSend", TRUE);
Options.ChangeTo = (INT)g_plugin.getDword("ChangeTo", ID_STATUS_ONLINE);
@@ -121,15 +118,11 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w hIconMsg = (HICON)CopyImage(Skin_LoadIcon(SKINICON_EVENT_MESSAGE), IMAGE_ICON, 16, 16, LR_COPYFROMRESOURCE);
SendDlgItemMessage(hwndDlg, IDC_MSGICON, STM_SETICON, (WPARAM)hIconMsg, 0);
- hIconUrl = (HICON)CopyImage(Skin_LoadIcon(SKINICON_EVENT_URL), IMAGE_ICON, 16, 16, LR_COPYFROMRESOURCE);
- SendDlgItemMessage(hwndDlg, IDC_URLICON, STM_SETICON, (WPARAM)hIconUrl, 0);
hIconFile = (HICON)CopyImage(Skin_LoadIcon(SKINICON_EVENT_FILE), IMAGE_ICON, 16, 16, LR_COPYFROMRESOURCE);
SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETICON, (WPARAM)hIconFile, 0);
CheckDlgButton(hwndDlg, IDC_CHK_MESSAGEREAD, Options.MessageRead ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_CHK_MESSAGESEND, Options.MessageSend ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_CHK_URLREAD, Options.UrlRead ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_CHK_URLSEND, Options.UrlSend ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_CHK_FILEREAD, Options.FileRead ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_CHK_FILESEND, Options.FileSend ? BST_CHECKED : BST_UNCHECKED);
@@ -169,14 +162,6 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w Options.MessageSend = !Options.MessageSend;
PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
- case IDC_CHK_URLREAD:
- Options.UrlRead = !Options.UrlRead;
- PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
- case IDC_CHK_URLSEND:
- Options.UrlSend = !Options.UrlSend;
- PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
case IDC_CHK_FILEREAD:
Options.FileRead = !Options.FileRead;
PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -281,8 +266,6 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w case PSN_APPLY:
g_plugin.setByte("MessageRead", (BYTE)Options.MessageRead);
g_plugin.setByte("MessageSend", (BYTE)Options.MessageSend);
- g_plugin.setByte("UrlRead", (BYTE)Options.UrlRead);
- g_plugin.setByte("UrlSend", (BYTE)Options.UrlSend);
g_plugin.setByte("FileRead", (BYTE)Options.FileRead);
g_plugin.setByte("FileSend", (BYTE)Options.FileSend);
g_plugin.setDword("ChangeTo", (DWORD)Options.ChangeTo);
@@ -304,7 +287,6 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w case WM_DESTROY:
DestroyIcon(hIconMsg);
- DestroyIcon(hIconUrl);
DestroyIcon(hIconFile);
break;
}
diff --git a/plugins/StatusChange/src/resource.h b/plugins/StatusChange/src/resource.h index 9b48911f7c..668f5c35fc 100644 --- a/plugins/StatusChange/src/resource.h +++ b/plugins/StatusChange/src/resource.h @@ -25,12 +25,9 @@ #define IDC_RAD_OUTTOLUNCH 2010
#define IDC_CHK_MESSAGEREAD 3001
#define IDC_CHK_MESSAGESEND 3002
-#define IDC_CHK_URLREAD 3003
-#define IDC_CHK_URLSEND 3004
#define IDC_CHK_FILEREAD 3005
#define IDC_CHK_FILESEND 3006
#define IDC_MSGICON 4001
-#define IDC_URLICON 4002
#define IDC_FILEICON 4003
// Next default values for new objects
diff --git a/plugins/StatusChange/src/stdafx.h b/plugins/StatusChange/src/stdafx.h index a1a22ef235..7d6e3b3146 100644 --- a/plugins/StatusChange/src/stdafx.h +++ b/plugins/StatusChange/src/stdafx.h @@ -27,8 +27,6 @@ struct TOPTIONS {
BOOL MessageRead;
BOOL MessageSend;
- BOOL UrlRead;
- BOOL UrlSend;
BOOL FileRead;
BOOL FileSend;
diff --git a/plugins/TrafficCounter/src/resource.h b/plugins/TrafficCounter/src/resource.h index 578cfbb0bc..fa4907236c 100644 --- a/plugins/TrafficCounter/src/resource.h +++ b/plugins/TrafficCounter/src/resource.h @@ -18,8 +18,6 @@ #define IDD_OPT_ICOLIB 110
#define IDD_ICOLIB_IMPORT 111
#define IDD_ADDED 115
-#define IDD_URLSEND 119
-#define IDD_URLRECV 120
#define IDD_AUTHREQ 121
#define IDD_DETAILS 125
#define IDD_HISTORY 127
@@ -253,7 +251,6 @@ #define IDC_LOADICONS 1369
#define IDC_STICONSGROUP 1371
#define IDC_MSGICON 1375
-#define IDC_URLICON 1376
#define IDC_STNOPAGE 1377
#define IDC_STCHECKMARKS 1380
#define IDC_MIRANDA 1388
diff --git a/plugins/Utils.pas/mirevents.pas b/plugins/Utils.pas/mirevents.pas index 7eada51593..5a92745602 100644 --- a/plugins/Utils.pas/mirevents.pas +++ b/plugins/Utils.pas/mirevents.pas @@ -10,7 +10,7 @@ uses type
TBaseEventType = (
mtUnknown,
- mtMessage, mtUrl, mtFile, mtSystem, mtContacts, mtStatus,
+ mtMessage, mtFile, mtSystem, mtContacts, mtStatus,
mtOther);
PMessageTypes = ^TMessageTypes;
@@ -183,13 +183,12 @@ type end;
var
- BuiltinEventTable: array[0..6] of TEventTableItem = (
+ BuiltinEventTable: array[0..5] of TEventTableItem = (
// must be the first item in array for unknown events
(EventType: MaxWord; MessageType: mtOther),
// events definitions
(EventType: EVENTTYPE_MESSAGE; MessageType: mtMessage),
(EventType: EVENTTYPE_FILE; MessageType: mtFile),
- (EventType: EVENTTYPE_URL; MessageType: mtUrl),
(EventType: EVENTTYPE_AUTHREQUEST; MessageType: mtSystem),
(EventType: EVENTTYPE_ADDED; MessageType: mtSystem),
(EventType: EVENTTYPE_CONTACTS; MessageType: mtContacts)
@@ -301,76 +300,6 @@ begin mFreeMem(buf);
end;
-
-// reads event from hDbEvent handle
-// reads all THistoryItem fields
-// *EXCEPT* Proto field. Fill it manually, plz
-(*
-procedure ReadEvent(hDBEvent: TMEVENT; var hi: THistoryItem; UseCP: Cardinal = CP_ACP);
-var
- EventInfo: TDBEventInfo;
- EventIndex: integer;
- Handled: Boolean;
-begin
- ZeroMemory(@hi,SizeOf(hi));
- hi.Height := -1;
- GetEventInfo(hDBEvent, EventInfo);
-
- hi.Module := EventInfo.szModule; {*}
- hi.proto := nil;
- hi.Time := EventInfo.Timestamp; {*}
- hi.IsRead := Boolean(EventInfo.flags and DBEF_READ); {*}
- hi.MessageType := GetMessageType(EventInfo, EventIndex); {!}
- hi.CodePage := UseCP; {?}
- // enable autoRTL feature
- if Boolean(EventInfo.flags and DBEF_RTL) then
- hi.RTLMode := hppRTLEnable; {*}
-
- hi.Text := GetEventCoreText(EventInfo, UseCP);
-{!!
- if hi.Text = nil then
- EventTable[EventIndex].TextFunction(EventInfo, hi);
-}
- hi.Text := AdjustLineBreaks(hi.Text);
- hi.Text := rtrimw(hi.Text);
-
- if hi.MessageType.code=mtMessage then
- if TextHasUrls(hi.Text) then
- begin
- hi.MessageType.code:=mtUrl;
- end;
-
- mFreeMem(EventInfo.pBlob);
-end;
-*)
-(*
-function GetEventName(const Hi: THistoryItem):PAnsiChar;
-var
- MesType: THppMessageType;
- mt: TBuiltinMessageType;
- etd: PDBEVENTTYPEDESCR;
-begin
- MesType := Hi.MessageType;
- for mt := Low(BuiltinEventNames) to High(BuiltinEventNames) do
- begin
- if MesType.code = mt then
- begin
- Result := BuiltinEventNames[mt];
- exit;
- end;
- end;
-
- etd := Pointer(CallService(MS_DB_EVENT_GETTYPE, WPARAM(Hi.Module), LPARAM(Hi.MessageType.event)));
- if etd = nil then
- begin
- Result := BuiltinEventNames[mtOther];
- end
- else
- Result := etd.descr;
-
-end;
-*)
-
type
TCustomEvent = record
Module : PAnsiChar;
@@ -384,13 +313,6 @@ const (Module:'WATrack' ; EventType:EVENTTYPE_WAT_MESSAGE {; MessageType:}),
(Module:'NewStatusNotify'; EventType:EVENTTYPE_STATUSCHANGE {; MessageType:}),
(Module:'Nudge' ; EventType:1 {; MessageType:})
-// (Module:nil; EventType:EVENTTYPE_AVATAR_CHANGE {; MessageType:}),
-// (Module:nil; EventType:ICQEVENTTYPE_MISSEDMESSAGE {; MessageType:}), ICQ_DB_GETEVENTTEXT_MISSEDMESSAGE
-// (Module:nil; EventType:ICQEVENTTYPE_EMAILEXPRESS {; MessageType:}),
-// (Module:nil; EventType:ICQEVENTTYPE_WEBPAGER {; MessageType:}),
-// (Module:nil; EventType:EVENTTYPE_SMS {; MessageType:}),
-// (Module:nil; EventType:EVENTTYPE_SMSCONFIRMATION {; MessageType:}),
-// (Module:nil; EventType:TWITTER_DB_EVENT_TYPE_TWEET {; MessageType:}),
);
//----- Support functions -----
@@ -507,10 +429,7 @@ var begin
case GetEventBaseType(EventInfo) of
mtMessage : idx:=SKINICON_EVENT_MESSAGE;
- mtUrl : idx:=SKINICON_EVENT_URL;
mtFile : idx:=SKINICON_EVENT_FILE;
-// mtSystem : idx:=;
-// mtContacts: idx:=;
mtStatus : begin
result:=0;
exit;
@@ -519,18 +438,6 @@ begin idx:=0;
end;
result:=CallService(MS_SKIN_LOADICON,idx,0);
-{
- case EventInfo.eventType of
- EVENTTYPE_MESSAGE: idx:=SKINICON_EVENT_MESSAGE;
- EVENTTYPE_FILE: idx:=SKINICON_EVENT_FILE;
- EVENTTYPE_URL: idx:=SKINICON_EVENT_URL;
- EVENTTYPE_AUTHREQUEST: idx:=SKINICON_AUTH_REQUEST;
- EVENTTYPE_ADDED: idx:=SKINICON_AUTH_ADD;
- EVENTTYPE_CONTACTS: idx:=
- EVENTTYPE_SMS: idx:=SKINICON_OTHER_SMS;
- else
- end;
-}
end;
end.
diff --git a/plugins/Variables/src/parse_miranda.h b/plugins/Variables/src/parse_miranda.h index 4637fff9ad..20ffab9b73 100644 --- a/plugins/Variables/src/parse_miranda.h +++ b/plugins/Variables/src/parse_miranda.h @@ -71,5 +71,3 @@ #define DBE_AUTHREQUEST 0x00001000 // pBlob = message
#define DBE_FILE 0x00002000 // pBlob = DWORD + file + description
#define DBE_OTHER 0x00008000
-#define DBE_ANYTYPE (DBE_MESSAGE|DBE_URL|DBE_CONTACTS|DBE_ADDED|DBE_AUTHREQUEST|DBE_FILE|DBE_STATUSCHANGE|DBE_OTHER)
-#define DBE_ANYFIRSTUNREAD (DBE_ANYTYPE|DBE_UNREAD|DBE_RCVD)
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 45f24dcba3..45b979e91f 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -11,8 +11,6 @@ #define MCODE_SND_VERSION 6 #define MCODE_REQ_AWAYMSG 7 #define MCODE_SND_AWAYMSG 8 -#define MCODE_SND_URL 9 -#define MCODE_ACK_URL 10 #define FCODE_SND_ACCEPT 1 #define FCODE_SND_FILEREQ 2 diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index c58444d0c2..3b30327ac1 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -23,8 +23,6 @@ #define IDD_ADDED 115
#define IDD_ENTER_STRING 116
#define IDI_ADDGROUP 117
-#define IDD_URLSEND 119
-#define IDD_URLRECV 120
#define IDD_AUTHREQ 121
#define IDD_DETAILS 125
#define IDD_HISTORY 127
|