fixes #3483 (History++: невозможно удалить из базы сообщение групчата)

4 files changed, 5 insertions, 2 deletions

diff --git a/plugins/ExternalAPI/delphi/m_ieview.inc b/plugins/ExternalAPI/delphi/m_ieview.inc
index 23993ffe76..5b0a309f68 100644
--- a/plugins/ExternalAPI/delphi/m_ieview.inc
+++ b/plugins/ExternalAPI/delphi/m_ieview.inc
@@ -132,8 +132,8 @@ type
     dwData   :dword;     // dword data e.g. status

     bIsMe    :bool;      // TRUE if the event is related to the user

     time     :dword;     // Time of the event

+    hEvent   :TMEVENT;   // Database event handle, if present

     next     :PtagIEVIEWEVENTDATA;

-    Text2    :TChar;     // Text, usage depends on type of event

   end;

   PIEVIEWEVENTDATA = PtagIEVIEWEVENTDATA;

   TIEVIEWEVENTDATA = TtagIEVIEWEVENTDATA;

diff --git a/plugins/ExternalAPI/m_ieview.h b/plugins/ExternalAPI/m_ieview.h
index 6ab950b63e..563ce1542e 100644
--- a/plugins/ExternalAPI/m_ieview.h
+++ b/plugins/ExternalAPI/m_ieview.h
@@ -123,6 +123,7 @@ struct IEVIEWEVENTDATA
 	uint32_t     dwData;            // DWORD data e.g. status see IEEDD_* values

 	int          bIsMe;             // TRUE if the event is related to the user

 	uint32_t     time;              // Time of the event

+	MEVENT       hEvent;            // Database event handle, if present

 	IEVIEWEVENTDATA *next;

 };

 

diff --git a/plugins/HistoryPlusPlus/hpp_external.pas b/plugins/HistoryPlusPlus/hpp_external.pas
index 53843d277f..cb81d72363 100644
--- a/plugins/HistoryPlusPlus/hpp_external.pas
+++ b/plugins/HistoryPlusPlus/hpp_external.pas
@@ -189,6 +189,7 @@ begin
             CustomItem.Nick := AnsiToWideString(AnsiString(customEvent.Nick.a),UsedCodepage);

           CustomItem.Sent := boolean(customEvent.bIsMe);

           CustomItem.Time := customEvent.time;

+          CustomItem.hEvent := customEvent.hEvent;

           ExtGrid.AddCustomEvent(event.hContact, CustomItem, UsedCodepage,

                              boolean(event.dwFlags and IEEF_RTL),

                              not boolean(event.dwFlags and IEEF_NO_SCROLLING));

diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
index c19a755f76..f21422393d 100644
--- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas
+++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
@@ -36,6 +36,7 @@ type
     Text: String;

     Sent: Boolean;

     Time: DWord;

+    HEvent: TMEVENT;

   end;

 

   TExtItem = record

@@ -957,7 +958,7 @@ end;
 

 procedure TExternalGrid.GridItemDelete(Sender: TObject; Index: Integer);

 begin

-  if (FGridState = gsDelete) and (Items[Index].hDBEvent <> 0) and (not Items[Index].Custom) then

+  if (FGridState = gsDelete) and (Items[Index].hDBEvent <> 0) then

     db_event_delete(Items[Index].hDBEvent);

   if Index <> High(Items) then

   begin