updater: get the updater GUI working on Linux

Change-Id: I3e7edb5319ab2e2ec316204b917a7e29c1791b5b

Repository.mk

@@ -57,9 +57,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	svg2odf \
 	svidl \
 	$(if $(ENABLE_ONLINE_UPDATE_MAR),\
-		$(if $(filter WNT,$(OS)), \
-			test_updater_dialog \
-	)) \
+		test_updater_dialog \
+	) \
 	treex \
 	ulfex \
 	unoidl-read \

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 \

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 \

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)

onlineupdate/workben/test_dialog.cxx

 #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);