From 52689653d07437c47b5c17f7ce8e261a9fea41bf Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Oct 2016 13:25:33 +0200
Subject: [PATCH] Adaptation to Updater changes

---
 Updater                  |   2 +-
 ZRCola/zrcolaapp.cpp     |   2 +-
 include/MSIBuildCfg.mak  | Bin 12364 -> 12412 bytes
 include/UpdaterCfg.h     |  19 -------------------
 include/common.props     |   4 +++-
 output/locale/.gitignore |   2 +-
 6 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/Updater b/Updater
index a9a04f8..2ca5b4d 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit a9a04f8df31335e28aedb5f38eb2bd44ba9ceb0a
+Subproject commit 2ca5b4d9d185b64221134366575ed2b3ba908d45
diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp
index cb11d3d..9537272 100644
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -57,7 +57,7 @@ bool ZRColaApp::OnInit()
     // Initialize locale.
     if (wxInitializeLocale(m_locale)) {
         wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
-        wxVERIFY(m_locale.AddCatalog(wxT("Updater") wxT(wxUpdaterVersion)));
+        wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola")));
         wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));
         wxVERIFY(m_locale.AddCatalog(wxT("ZRCola")));
         wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb")));
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index 740904216b743f59d836c86ada2db6a268d38598..509d1d2555c2e12315a2e6190ab348af2c4de2a9 100644
GIT binary patch
delta 44
ycmX?;@F!t|kHO>;eF23q23Lk4hF}Iy27d-W23v+GAkUd0pCN}Kk%5<iiva*2R|&uX

delta 7
Ocmey9a3*1cj{yJ?e*?7u

diff --git a/include/UpdaterCfg.h b/include/UpdaterCfg.h
index c087ef5..9b4b37c 100644
--- a/include/UpdaterCfg.h
+++ b/include/UpdaterCfg.h
@@ -15,22 +15,3 @@
 // Update server catalog location
 //
 #define UPDATER_HTTP_PATH           "/prenos/ZRCola/catalog-0000.xml"
-
-
-//
-// The product vendor and application name for configuration keeping.
-//
-#define UPDATER_CFG_VENDOR          "Amebis"
-#define UPDATER_CFG_APPLICATION     "ZRCola"
-
-
-//
-// Product version as a single DWORD
-// Note: Used for version comparison within C/C++ code.
-//
-#define UPDATER_PRODUCT_VERSION     PRODUCT_VERSION
-
-//
-// Human readable product version and build year for UI
-//
-#define UPDATER_PRODUCT_VERSION_STR PRODUCT_VERSION_STR
diff --git a/include/common.props b/include/common.props
index e66cdfc..2ad5682 100644
--- a/include/common.props
+++ b/include/common.props
@@ -21,7 +21,9 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="xgettext.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <UpdaterVersion>ZRCola</UpdaterVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName>
     <IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
diff --git a/output/locale/.gitignore b/output/locale/.gitignore
index bef151b..1bf1f4e 100644
--- a/output/locale/.gitignore
+++ b/output/locale/.gitignore
@@ -1,7 +1,7 @@
 */libZRColaUI.mo
 */wxExtend14.mo
 */wxstd.mo
-*/Updater10.mo
+*/UpdaterZRCola.mo
 */ZRCola.mo
 */ZRColaCompile.mo
 */ZRCola-zrcdb.mo