From c832aae70e55f5f97f5f9093735f493cd29cd9b9 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 22 Aug 2017 19:59:10 +0200
Subject: updater: get the updater GUI working on Linux

Change-Id: I3e7edb5319ab2e2ec316204b917a7e29c1791b5b
---
 onlineupdate/Executable_updater.mk                    | 1 -
 onlineupdate/Module_onlineupdate.mk                   | 2 +-
 onlineupdate/source/update/updater/progressui_gtk.cxx | 6 +++++-
 onlineupdate/workben/test_dialog.cxx                  | 7 ++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'onlineupdate')

diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index a717f2f8aa3c..a4ceacee6bc1 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\
 	onlineupdate/source/update/updater/archivereader \
 	onlineupdate/source/update/updater/bspatch \
 	onlineupdate/source/update/updater/progressui_gtk \
-	onlineupdate/source/update/updater/progressui_null \
 	onlineupdate/source/update/updater/updater \
 	$(if $(filter WNT,$(OS)),\
 		onlineupdate/source/update/updater/loaddlls \
diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk
index a343506e351d..58e1d3de4531 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -17,8 +17,8 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
 	StaticLibrary_updatehelper \
 	$(if $(filter WNT,$(OS)),\
 		Executable_update_service \
-		Executable_test_updater_dialog \
 		WinResTarget_updater )\
+	Executable_test_updater_dialog \
 	Executable_mar \
 	Executable_updater \
 	Executable_mbsdiff \
diff --git a/onlineupdate/source/update/updater/progressui_gtk.cxx b/onlineupdate/source/update/updater/progressui_gtk.cxx
index fecd98a8730a..595a29ad68cf 100644
--- a/onlineupdate/source/update/updater/progressui_gtk.cxx
+++ b/onlineupdate/source/update/updater/progressui_gtk.cxx
@@ -11,6 +11,7 @@
 #include "progressui.h"
 #include "readstrings.h"
 #include "errors.h"
+#include <string.h>
 
 #define TIMER_INTERVAL 100
 
@@ -76,7 +77,10 @@ ShowProgressUI()
 
     StringTable strings;
     if (ReadStrings(ini_path, &strings) != OK)
-        return -1;
+    {
+        strcpy(strings.title, "LibreOffice Updater");
+        strcpy(strings.info, "This program is updating your LibreOffice installation.");
+    }
 
     sWin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     if (!sWin)
diff --git a/onlineupdate/workben/test_dialog.cxx b/onlineupdate/workben/test_dialog.cxx
index 113ec07eebbd..ba9f258df913 100644
--- a/onlineupdate/workben/test_dialog.cxx
+++ b/onlineupdate/workben/test_dialog.cxx
@@ -1,5 +1,10 @@
 #include "progressui.h"
+
+#if defined(_WIN32)
 #include "progressui_win.cxx"
+#else
+#include "progressui_gtk.cxx"
+#endif
 
 #include <thread>
 #include <chrono>
@@ -15,7 +20,7 @@ void func()
     QuitProgressUI();
 }
 
-int wmain(int argc, wchar_t** argv)
+int NS_main(int argc, NS_tchar** argv)
 {
     InitProgressUI(&argc, &argv);
     std::thread a(func);
-- 
cgit