X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftimers.cpp;h=bf334bf8a0453ebc89fb566e5df62329bbcb57a2;hb=fe50d12a5d3750dd8993d5358fb53c76f1d0ac2a;hp=abe6f5eeb32543c7c8ac3e63b60c8c188003d763;hpb=48ee8536f42ca5a34cb8d465651519d74a625d19;p=xestiaab%2F.git
diff --git a/source/common/timers.cpp b/source/common/timers.cpp
index abe6f5e..bf334bf 100644
--- a/source/common/timers.cpp
+++ b/source/common/timers.cpp
@@ -1,4 +1,22 @@
-#include "../frmActivityMgr.h"
+// timers.cpp - Timers subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book 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, version 3 of the license.
+//
+// Xestia Address Book 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 Xestia Address Book. If not, see
+
+#include "../actmgr/frmActivityMgr.h"
#include "../frmContact.h"
#include "../frmMain.h"
#include
@@ -245,7 +263,7 @@ void wxActListProcTimer::Notify(){
ueventdata->ItemIndex = LongIter->second;
ueventdata->ItemLabel = _("Processing...");
- ueventdata->ItemDes = _("Adding Contact '") + DetailIter->second + _("'...");
+ //ueventdata->ItemDes = _("Adding Contact '") + DetailIter->second + _("'...");
wxPostEvent(static_cast(ActMgrPtr), uevent);
@@ -295,6 +313,12 @@ void wxActListProcTimer::Notify(){
ActListFinDTPtr->insert(std::make_pair(iter->first, adt));
+ // Delete the connection object.
+
+ std::map::iterator ConnObject = ActListConnPtr->find(iter->first);
+ delete ConnObject->second;
+ ConnObject->second = NULL;
+
}
if (ClearupProcessed == TRUE){
@@ -324,7 +348,7 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map *ActListDetail, bool *TasksActive,
wxListCtrl *lstActivity, wxStaticText *lblDetails, wxGauge *GauProgress,
void *ActMgr, wxActTimer *ActTimer, wxActProcessTimer *ActProcessTimer,
- std::map *ActListFinDT){
+ std::map *ActListFinDT, std::map *ActListConn){
ActListPtr = ActList;
ActListUIPtr = ActListUI;
@@ -337,6 +361,7 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map