Merge commits from upstream

diff --git a/projects/msw/xestiaab.rc b/projects/msw/xestiaab.rc
index 91010c6..cd32b0b 100644 (file)
--- a/projects/msw/xestiaab.rc
+++ b/projects/msw/xestiaab.rc
@@ -23,8 +23,8 @@ XAB_MAINICON       ICON           "xestiaab_win32icon.ico"
 //
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 1 VERSIONINFO
 //
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 1 VERSIONINFO

-    FILEVERSION     0,14,0,0
-    PRODUCTVERSION  0,14,0,0
+    FILEVERSION     0,13,0,0
+    PRODUCTVERSION  0,13,0,0

     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_APP
     FILESUBTYPE     VFT2_UNKNOWN
     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_APP
     FILESUBTYPE     VFT2_UNKNOWN


@@ -38,14 +38,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
             VALUE "Comments", "For more information, visit http://xestia.co.uk/addressbook"
             VALUE "CompanyName", "Xestia Software Development"
             VALUE "FileDescription", "Application executable"
             VALUE "Comments", "For more information, visit http://xestia.co.uk/addressbook"
             VALUE "CompanyName", "Xestia Software Development"
             VALUE "FileDescription", "Application executable"

-            VALUE "FileVersion", "0.14"
+            VALUE "FileVersion", "0.13"

             VALUE "InternalName", "xestiaab.exe"
             VALUE "LegalCopyright", "(c) 2016 Xestia Software Development"
             VALUE "LegalTrademarks", ""
             VALUE "OriginalFilename", "xestiaab.exe"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "Xestia Address Book"
             VALUE "InternalName", "xestiaab.exe"
             VALUE "LegalCopyright", "(c) 2016 Xestia Software Development"
             VALUE "LegalTrademarks", ""
             VALUE "OriginalFilename", "xestiaab.exe"
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "Xestia Address Book"

-            VALUE "ProductVersion", "0.14"
+            VALUE "ProductVersion", "0.13"

             VALUE "SpecialBuild", ""
         }
     }
             VALUE "SpecialBuild", ""
         }
     }

diff --git a/projects/msw/xestiaab.vcxproj b/projects/msw/xestiaab.vcxproj
index 575e6b7..cfd8129 100644 (file)
--- a/projects/msw/xestiaab.vcxproj
+++ b/projects/msw/xestiaab.vcxproj
@@ -44,7 +44,6 @@
     <ClCompile Include="..\..\source\common\timers.cpp" />
     <ClCompile Include="..\..\source\common\uuid.cpp" />
     <ClCompile Include="..\..\source\common\win32ssl.cpp" />
     <ClCompile Include="..\..\source\common\timers.cpp" />
     <ClCompile Include="..\..\source\common\uuid.cpp" />
     <ClCompile Include="..\..\source\common\win32ssl.cpp" />

-    <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject-Save.cpp" />

     <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject.cpp" />
     <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Business.cpp" />
     <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Calendar.cpp" />
     <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject.cpp" />
     <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Business.cpp" />
     <ClCompile Include="..\..\source\contacteditor\frmContactEditor-Calendar.cpp" />


@@ -350,8 +349,8 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>

-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>vc_mswudll_x64\xestiaab.pdb</ProgramDataBaseFileName>
+      <ObjectFileName>vc_mswudll_x64\minimal\</ObjectFileName>
+      <ProgramDataBaseFileName>vc_mswudll_x64\minimal.pdb</ProgramDataBaseFileName>

       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

diff --git a/projects/msw/xestiaab.vcxproj.filters b/projects/msw/xestiaab.vcxproj.filters
index 2ef4f40..d196cc4 100644 (file)
--- a/projects/msw/xestiaab.vcxproj.filters
+++ b/projects/msw/xestiaab.vcxproj.filters
@@ -302,9 +302,6 @@
     <ClCompile Include="..\..\source\search\XABSearchPanel.cpp">
       <Filter>Resource Files\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\search\XABSearchPanel.cpp">
       <Filter>Resource Files\Source Files</Filter>
     </ClCompile>

-    <ClCompile Include="..\..\source\contacteditor\cdo\ContactDataObject-Save.cpp">
-      <Filter>Resource Files\Source Files</Filter>
-    </ClCompile>

   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xestiaab.rc">
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xestiaab.rc">

diff --git a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj
index db38ff5..3a8d59c 100644 (file)
--- a/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj
+++ b/projects/osx/XestiaAddressBook.xcodeproj/project.pbxproj
@@ -124,7 +124,6 @@
                4A83E3EE1B238813003294C2 /* import-vcard3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3E61B238813003294C2 /* import-vcard3.cpp */; };
                4A83E3EF1B238813003294C2 /* import-vcard4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3E81B238813003294C2 /* import-vcard4.cpp */; };
                4A83E3F01B238813003294C2 /* import.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3EA1B238813003294C2 /* import.cpp */; };
                4A83E3EE1B238813003294C2 /* import-vcard3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3E61B238813003294C2 /* import-vcard3.cpp */; };
                4A83E3EF1B238813003294C2 /* import-vcard4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3E81B238813003294C2 /* import-vcard4.cpp */; };
                4A83E3F01B238813003294C2 /* import.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A83E3EA1B238813003294C2 /* import.cpp */; };

-               4A921D221D319386004EFA3E /* ContactDataObject-Save.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A921D211D319386004EFA3E /* ContactDataObject-Save.cpp */; };

                4A96DD751B93D5D400FAD2CA /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */; };
                4A98DD3B1B6ABEC80002E872 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */; };
                4A98DD431B7E57FC0002E872 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A98DD421B7E57FC0002E872 /* Security.framework */; };
                4A96DD751B93D5D400FAD2CA /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */; };
                4A98DD3B1B6ABEC80002E872 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */; };
                4A98DD431B7E57FC0002E872 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A98DD421B7E57FC0002E872 /* Security.framework */; };


@@ -355,7 +354,6 @@
                4A83E3E91B238813003294C2 /* import-vcard4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "import-vcard4.h"; path = "../../source/import/import-vcard4.h"; sourceTree = "<group>"; };
                4A83E3EA1B238813003294C2 /* import.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = import.cpp; path = ../../source/import/import.cpp; sourceTree = "<group>"; };
                4A83E3EB1B238813003294C2 /* import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = import.h; path = ../../source/import/import.h; sourceTree = "<group>"; };
                4A83E3E91B238813003294C2 /* import-vcard4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "import-vcard4.h"; path = "../../source/import/import-vcard4.h"; sourceTree = "<group>"; };
                4A83E3EA1B238813003294C2 /* import.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = import.cpp; path = ../../source/import/import.cpp; sourceTree = "<group>"; };
                4A83E3EB1B238813003294C2 /* import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = import.h; path = ../../source/import/import.h; sourceTree = "<group>"; };

-               4A921D211D319386004EFA3E /* ContactDataObject-Save.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ContactDataObject-Save.cpp"; path = "../../source/contacteditor/cdo/ContactDataObject-Save.cpp"; sourceTree = "<group>"; };

                4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; };
                4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
                4A98DD421B7E57FC0002E872 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
                4A96DD741B93D5D400FAD2CA /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = System/Library/Frameworks/SecurityInterface.framework; sourceTree = SDKROOT; };
                4A98DD3A1B6ABEC80002E872 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
                4A98DD421B7E57FC0002E872 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };


@@ -415,7 +413,6 @@
                4A6DA35A1CAC067900A15B3D /* cdo */ = {
                        isa = PBXGroup;
                        children = (
                4A6DA35A1CAC067900A15B3D /* cdo */ = {
                        isa = PBXGroup;
                        children = (

-                               4A921D211D319386004EFA3E /* ContactDataObject-Save.cpp */,

                                4A6DA35B1CAC068900A15B3D /* ContactDataObject.cpp */,
                                4A6DA35C1CAC068900A15B3D /* ContactDataObject.h */,
                        );
                                4A6DA35B1CAC068900A15B3D /* ContactDataObject.cpp */,
                                4A6DA35C1CAC068900A15B3D /* ContactDataObject.h */,
                        );


@@ -800,7 +797,6 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               4A921D221D319386004EFA3E /* ContactDataObject-Save.cpp in Sources */,

                                4A6DA3EB1CAC0B8C00A15B3D /* bitmapcode.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                4A6DA3EB1CAC0B8C00A15B3D /* bitmapcode.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index 546795a..63755f8 100644 (file)
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -218,7 +218,6 @@ void frmActivityMgr::ProcessTasksThread()
        std::map<int,long>::iterator LongIter;
        bool TasksFoundProc = FALSE;
        wxString TaskDetail;
        std::map<int,long>::iterator LongIter;
        bool TasksFoundProc = FALSE;
        wxString TaskDetail;

-       XABPreferences PrefData(GetUserPrefDir());

        
        for (std::map<int,int>::iterator iter = ActivityList.begin(); 
         iter != ActivityList.end(); ++iter){
        
        for (std::map<int,int>::iterator iter = ActivityList.begin(); 
         iter != ActivityList.end(); ++iter){


@@ -269,6 +268,7 @@ void frmActivityMgr::ProcessTasksThread()
                // 8 = Completed. (UI Updated). 
                
                frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
                // 8 = Completed. (UI Updated). 
                
                frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);

+               XABPreferences PrefData(GetUserPrefDir());

                
                if (iter->second == 0){
                
                
                if (iter->second == 0){
                


@@ -1221,6 +1221,13 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&SSLICNProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        
                                                                event.SetClientData(&SSLICNProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        

+                                                               /*timespec n1, n2;
+                                               
+                                                               // Fall asleep until we get an response.
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                       

                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);


@@ -1459,6 +1466,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                

+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                               

                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);


@@ -1723,6 +1735,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                                

+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                               

                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);


@@ -1855,6 +1872,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        
                                                                event.SetClientData(&vCardProcData);
                                                                wxPostEvent(frmMainPtrGet, event);
                                        

+                                                               /*timespec n1, n2;
+                                               
+                                                               n1.tv_sec = 0;
+                                                               n1.tv_nsec = 250000000L;*/
+                                       

                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);
                                                                while (*PauseMode == TRUE){
                                                                        //nanosleep(&n1, &n2);
                                                                        SleepFor(250000000);


@@ -2019,11 +2041,11 @@ void frmActivityMgr::ProcessTasksThread()
                                                KeepUpdating = FALSE;
                                        
                                        }
                                                KeepUpdating = FALSE;
                                        
                                        }

-
+                                       

                                }
                                }

-
+                               

                                // Mark as completed.
                                // Mark as completed.

-
+                       

                                wxString AccountNameFinal;
                                AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
                                AccountNameFinal.Append(wxT(".carddav"));
                                wxString AccountNameFinal;
                                AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
                                AccountNameFinal.Append(wxT(".carddav"));


@@ -2031,7 +2053,7 @@ void frmActivityMgr::ProcessTasksThread()
                                wxCommandEvent reloadevent(RELOADCONTACTLIST);
                                reloadevent.SetString(AccountNameFinal);
                                wxPostEvent(this->GetParent(), reloadevent);
                                wxCommandEvent reloadevent(RELOADCONTACTLIST);
                                reloadevent.SetString(AccountNameFinal);
                                wxPostEvent(this->GetParent(), reloadevent);

-
+                               

                                iter->second = 4;
                                continue;
                        
                                iter->second = 4;
                                continue;
                        

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index ac703d8..6625432 100644 (file)
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -245,7 +245,7 @@ frmMainADT( parent )
     
 #elif defined(__WIN32__)
     
     
 #elif defined(__WIN32__)
     

-       int stbBottomData [4] = { -1, 16, 16, 16 };
+       int stbBottomData [4] = { -1, 8, 8, 8 };

     
 #else
     
     
 #else
     


@@ -264,10 +264,8 @@ frmMainADT( parent )
        stbBottom->GetFieldRect(3, rectActivity);
     
        SSLToolTip = new wxToolTip(wxT(""));
        stbBottom->GetFieldRect(3, rectActivity);
     
        SSLToolTip = new wxToolTip(wxT(""));

-
-#if defined(__WIN32__)
-
-       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint(rectOnline.GetX(),rectOnline.GetY()), wxDefaultSize, 0 );
+    
+       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()),(rectOnline.GetY())), wxDefaultSize, 0 );

        imgConnStatus->SetBitmap(*imgOnline);
        imgConnStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ToggleConnectionStatus ), NULL, this );
     
        imgConnStatus->SetBitmap(*imgOnline);
        imgConnStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ToggleConnectionStatus ), NULL, this );
     


@@ -280,23 +278,6 @@ frmMainADT( parent )
        imgActivityStatus->SetBitmap(*imgActIconSleep);
        imgActivityStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ShowActivityWindow ), NULL, this );
     
        imgActivityStatus->SetBitmap(*imgActIconSleep);
        imgActivityStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ShowActivityWindow ), NULL, this );
     

-#else
-
-       imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()), (rectOnline.GetY())), wxDefaultSize, 0);
-       imgConnStatus->SetBitmap(*imgOnline);
-       imgConnStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ToggleConnectionStatus), NULL, this);
-
-       imgSSLStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectSSL.GetX()), (rectSSL.GetY())), wxDefaultSize, 0);
-       imgSSLStatus->SetBitmap(*imgNoSSL);
-       imgSSLStatus->SetToolTip(SSLToolTip);
-       imgSSLStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowSSLCertificates), NULL, this);
-
-       imgActivityStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectActivity.GetX()), (rectActivity.GetY())), wxDefaultSize, 0);
-       imgActivityStatus->SetBitmap(*imgActIconSleep);
-       imgActivityStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowActivityWindow), NULL, this);
-
-#endif
-

        // Setup the window menu.
     
        // By default should be:
        // Setup the window menu.
     
        // By default should be:


@@ -2595,7 +2576,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
 
                        // Setup and display the form.
 
 
                        // Setup and display the form.
 

-                       if (SSLCertificateIter == AccountCertificateData.end() || SSLCertificateIter->second->pCertInfo == NULL){
+                       if (SSLCertificateIter->second->pCertInfo == NULL){

 
                                wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");
 
 
                                wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");