# HG changeset patch # User Olaf Wintermann # Date 1773572825 -3600 # Node ID ccc5680178720f25af367308ca071c79803b43c1 # Parent be89ffebd4f3f17c495320d99bdbdcfbe7124747# Parent 3462e70492dea589b8bdcb1f4e98d2f1f62b9024 merge diff -r 3462e70492de -r ccc568017872 ui/cocoa/toolkit.m --- a/ui/cocoa/toolkit.m Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/cocoa/toolkit.m Sun Mar 15 12:07:05 2026 +0100 @@ -28,6 +28,9 @@ #import "toolkit.h" +#include +#include + #include "../common/document.h" #include "../common/properties.h" #include "../common/menu.h" @@ -53,7 +56,7 @@ void ui_init(const char *appname, int argc, char **argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; app_argc = argc; app_argv = (const char**)argv; diff -r 3462e70492de -r ccc568017872 ui/gtk/toolkit.c --- a/ui/gtk/toolkit.c Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/gtk/toolkit.c Sun Mar 15 12:07:05 2026 +0100 @@ -63,7 +63,7 @@ static UiBool exit_on_shutdown; UIEXPORT void ui_init(const char *appname, int argc, char **argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; uic_init_global_context(); #if GTK_MAJOR_VERSION >= 4 diff -r 3462e70492de -r ccc568017872 ui/motif/toolkit.c --- a/ui/motif/toolkit.c Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/motif/toolkit.c Sun Mar 15 12:07:05 2026 +0100 @@ -90,7 +90,7 @@ } void ui_init(const char *appname, int argc, char **argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; uic_init_global_context(); XtToolkitInitialize(); @@ -98,7 +98,7 @@ app = XtCreateApplicationContext(); XtAppSetFallbackResources(app, fallback_resources); - display = XtOpenDisplay(app, NULL, appname, appname, NULL, 0, &argc, argv); + display = XtOpenDisplay(app, NULL, application_name, application_name, NULL, 0, &argc, argv); uic_menu_init(); uic_toolbar_init(); diff -r 3462e70492de -r ccc568017872 ui/qt/toolkit.cpp --- a/ui/qt/toolkit.cpp Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/qt/toolkit.cpp Sun Mar 15 12:07:05 2026 +0100 @@ -49,7 +49,7 @@ static UiBool exit_on_shutdown; void ui_init(const char *appname, int argc, char **argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; app_argc = argc; app_argv = argv; diff -r 3462e70492de -r ccc568017872 ui/server/toolkit.c --- a/ui/server/toolkit.c Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/server/toolkit.c Sun Mar 15 12:07:05 2026 +0100 @@ -53,7 +53,7 @@ static uint64_t srv_obj_id_counter = 0; void ui_init(const char *appname, int argc, char **argv) { - ui_app_name = appname; + ui_app_name = appname ? strdup(appname) : NULL; message_handler = uic_simple_msg_handler(STDIN_FILENO, STDOUT_FILENO, ui_server_message_received); diff -r 3462e70492de -r ccc568017872 ui/win32/toolkit.c --- a/ui/win32/toolkit.c Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/win32/toolkit.c Sun Mar 15 12:07:05 2026 +0100 @@ -41,6 +41,7 @@ #include #include +#include #include @@ -49,7 +50,7 @@ static HFONT ui_font = NULL; void ui_init(const char *appname, int argc, char **argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; uic_init_global_context(); uic_menu_init(); diff -r 3462e70492de -r ccc568017872 ui/winui/toolkit.cpp --- a/ui/winui/toolkit.cpp Fri Mar 13 17:22:32 2026 +0100 +++ b/ui/winui/toolkit.cpp Sun Mar 15 12:07:05 2026 +0100 @@ -33,6 +33,9 @@ #include #include +#include +#include + #include "../common/context.h" #include "../common/document.h" #include "../common/toolbar.h" @@ -147,7 +150,7 @@ } void ui_init(const char* appname, int argc, char** argv) { - application_name = appname; + application_name = appname ? strdup(appname) : NULL; //ui_appsdk_bootstrap();