temporary rollback

git-svn-id: http://svn.miranda-ng.org/main/trunk@9964 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 9 insertions, 15 deletions

diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h
index a56212c9e9..c5c192d63f 100644
--- a/plugins/PluginUpdater/src/Common.h
+++ b/plugins/PluginUpdater/src/Common.h
@@ -48,6 +48,7 @@ Boston, MA 02111-1307, USA.
 #include "resource.h"

 

 #if MIRANDA_VER < 0x0A00

+#include <m_popup2.h>

 #include "compat.h"

 #endif

 

@@ -106,24 +107,16 @@ struct PlugOptions
 #define DEFAULT_PERIODMEASURE     1

 

 #if MIRANDA_VER < 0x0A00

+	#define DEFAULT_UPDATEICONS       1

 	#define DEFAULT_ONLYONCEADAY      0

 #else

+	#define DEFAULT_UPDATEICONS       0

 	#define DEFAULT_ONLYONCEADAY      1

 #endif

 

 #define DEFAULT_UPDATE_URL                "http://miranda-ng.org/distr/stable/x%platform%"

 #define DEFAULT_UPDATE_URL_TRUNK          "http://miranda-ng.org/distr/x%platform%"

-#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS  "http://miranda-ng.now.im/pdb_x%platform%"

-

-#define UPDATE_MODE_CUSTOM			0

-#define UPDATE_MODE_STABLE			1

-#define UPDATE_MODE_TRUNK			2

-#define UPDATE_MODE_TRUNK_SYMBOLS	3

-

-#define POPUP_TYPE_MSG  0

-#define POPUP_TYPE_ERROR 1

-#define POPUP_TYPE_INFO 2

-#define POPUP_TYPE_PROGRESS 2

+#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS  "http://miranda-ng.now.im/pdb_x%platform%/"

 

 #define MAX_RETRIES			3

 

@@ -140,7 +133,7 @@ extern FILEINFO *pFileInfo;
 extern PlugOptions opts;

 extern POPUP_OPTIONS PopupOptions;

 extern aPopups PopupsList[POPUPS];

-extern HANDLE Timer, hPipe, hNetlibUser;

+extern HANDLE Timer, hPipe;

 

 void DoCheck();

 

@@ -209,10 +202,10 @@ int   CompareHashes(const ServListEntry *p1, const ServListEntry *p2);
 TCHAR* GetDefaultUrl();

 bool   DownloadFile(FILEURL *pFileURL, HANDLE &nlc);

 

-void  ShowPopup(LPCTSTR Title, LPCTSTR Text, int Number);

+void  ShowPopup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType, bool NoMessageBox = false);

 void  __stdcall RestartMe(void*);

 void  __stdcall OpenPluginOptions(void*);

-void  CheckUpdateOnStartup();

+BOOL  AllowUpdateOnStartup();

 void  InitTimer(void *type);

 

 INT_PTR EmptyFolder(WPARAM,LPARAM);

@@ -221,13 +214,14 @@ INT_PTR CALLBACK DlgMsgPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 

 int  ImageList_AddIconFromIconLib(HIMAGELIST hIml, const char *name);

 

-bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath);

+bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath,bool ch);

 void strdel(TCHAR *parBuffer, int len);

 

 ///////////////////////////////////////////////////////////////////////////////

 

 int CalculateModuleHash(const TCHAR *tszFileName, char *dest);

 

+BOOL IsRunAsAdmin();

 BOOL IsProcessElevated();

 bool PrepareEscalation();