X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.h;h=657cfc98ea9653d3b7a9e38251f323e2c3fcf84a;hp=b9e564bfb43b59116334e8d30ae2ab925be4f3c0;hb=d71757f322746223ba535a9b04239541c81e3da3;hpb=540e667a9fdae2213756c164185e4d7f78f33e2b

diff --git a/source/frmMain.h b/source/frmMain.h
index b9e564b..657cfc9 100644
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -47,6 +47,7 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 #include "common/timers.h"
 #include "common/events.h"
 #include "common/etag.h"
+#include "common/structs.h"
 #include "bitmaps.h"
 #include "common/sslcertstructs.h"
 #include "widgets/XABContactMenu.h"
@@ -55,7 +56,6 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 //// end generated include
 
 DECLARE_EVENT_TYPE(CE_UPDATECONTACTLIST, wxID_ANY)
-DECLARE_EVENT_TYPE(CE_UPDATEACCOUNTLIST, wxID_ANY)
 DECLARE_EVENT_TYPE(SE_UPDATECONTACTNOTIF, wxID_ANY)
 DECLARE_EVENT_TYPE(CE_OPENCONTACT, wxID_ANY)
 DECLARE_EVENT_TYPE(CE_OPENCONTACTLIST, wxID_ANY)
@@ -99,11 +99,6 @@ struct SWCloseNotif{
 	void *SCHWinPtr;
 };
 
-struct QRNotif{
-	int *QResponse;
-	bool *PausePtr;
-};
-
 struct XABViewMode{
 
 	int SortMode;
@@ -211,7 +206,7 @@ class frmMain : public frmMainADT
 		void OpenPreferences( wxCommandEvent& event );
 		void OpenNewABDialog( wxCommandEvent& event );
 		void LoadPreferences( wxActivateEvent& event );
-		void LoadPreferences();
+		void LoadPreferences(bool skipWindowSizeReload);
 		void ShowContactInfo( wxListEvent& event );
 		void OpenContactInfoList( wxListEvent& event );
 		void OpenContactInfoList( wxCommandEvent& event );
@@ -225,7 +220,6 @@ class frmMain : public frmMainADT
 			      const std::wstring &name);
 		void ConflictResolution( wxCommandEvent& event );
 		void UpdateContactList( wxCommandEvent& event );
-		void UpdateAccountList( wxCommandEvent& event );
 		void UpdateSearchContactLists( wxCommandEvent& event );
 		void OpenFindContactsWindow(wxCommandEvent& event);
 		void RevealContact( wxCommandEvent& event );