From 3dd8f26c946dfaf51871c50ee3d6b4cff3c84c9f Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Sat, 27 Aug 2016 16:41:26 +0200
Subject: [PATCH] Registry settings key names changed as separate manufacturer
 name introduced

---
 EventMonitor/App.cpp               |   2 +-
 EventMonitor/wxEventMonitor_UI.cpp |   2 +-
 EventMonitor/wxEventMonitor_UI.fbp |   2 +-
 MSI/Base/Main/Makefile             | Bin 14940 -> 14900 bytes
 MSI/MSIBuild                       |   2 +-
 include/MSIBuildCfg.mak            | Bin 7928 -> 7984 bytes
 include/Version.h                  |   5 +++++
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/EventMonitor/App.cpp b/EventMonitor/App.cpp
index 40249eb..c4e78d3 100644
--- a/EventMonitor/App.cpp
+++ b/EventMonitor/App.cpp
@@ -46,7 +46,7 @@ bool wxEventMonitorApp::OnInit()
         ::MsiUseFeature(_T(PRODUCT_VERSION_GUID), _T("featEventMonitor"));
 #endif
 
-    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT("EventMonitor"), wxT(PRODUCT_NAME_STR)));
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_NAME_STR), wxT(VENDOR_NAME_STR)));
     if (cfgPrev) wxDELETE(cfgPrev);
 
     if (!wxApp::OnInit())
diff --git a/EventMonitor/wxEventMonitor_UI.cpp b/EventMonitor/wxEventMonitor_UI.cpp
index 5f3d61c..a7b2248 100644
--- a/EventMonitor/wxEventMonitor_UI.cpp
+++ b/EventMonitor/wxEventMonitor_UI.cpp
@@ -18,7 +18,7 @@ wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 	
-	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("Log") );
+	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("EventMonitorLog") );
 	bSizerMain->Add( m_log, 1, wxEXPAND, 5 );
 	
 	
diff --git a/EventMonitor/wxEventMonitor_UI.fbp b/EventMonitor/wxEventMonitor_UI.fbp
index d5d9055..f48cab7 100644
--- a/EventMonitor/wxEventMonitor_UI.fbp
+++ b/EventMonitor/wxEventMonitor_UI.fbp
@@ -141,7 +141,7 @@
                         <property name="validator_type">wxDefaultValidator</property>
                         <property name="validator_variable"></property>
                         <property name="window_extra_style"></property>
-                        <property name="window_name">Log</property>
+                        <property name="window_name">EventMonitorLog</property>
                         <property name="window_style">wxNO_BORDER</property>
                         <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>
diff --git a/MSI/Base/Main/Makefile b/MSI/Base/Main/Makefile
index 37c7ee72373731d1d586e3df4c81f00bc958fd1b..c7e0e7bccd1d41983835f32a36bf35d6bb05a1f5 100644
GIT binary patch
delta 12
TcmcapvZZ9h4&%)ajBD5cF2n|0

delta 48
zcmdl|a;Id&4r66shD3%uhEj$!Af3!m0%R32qyjM~gFC}X21f=zhLFvhjT_kjXX*_=

diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index 7a459c8..cc188d9 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit 7a459c8c6c785bffb63a73219998a57f8d610de5
+Subproject commit cc188d9860459f1e12c36592b189f3f5686a253a
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index 7306123cc04537498cc8316732e96004c70121f9..ecd382934211d128cff1ee02c6092f264bbc0e6d 100644
GIT binary patch
delta 36
scmexiyTNXQ2s?KegDZm{gA0Q{L(pVJcJawYTw;@XI3+ggu%8hJ0JfY7NB{r;

delta 12
TcmdmB_rrFB2>WIq_9x;1BcufI

diff --git a/include/Version.h b/include/Version.h
index 955101a..431fff6 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -60,6 +60,11 @@
 //
 #define PRODUCT_VERSION_GUID     "{13ADDFF3-B249-4AB5-9FAD-E4CDCED62B11}"
 
+//
+// Product vendor
+//
+#define VENDOR_NAME_STR          "GÉANT"
+
 //
 // Since the product name is not finally confirmed at the time of
 // developing it, make it easily customizable.