Rebase onto master

diff --git a/libs/uilib/uilib.cpp b/libs/uilib/uilib.cpp
index 824af8cef43a7530754664e9739df4c70739fb92..f25172242acbcd48fe45e534039a50bd7802cf9e 100644 (file)
--- a/libs/uilib/uilib.cpp
+++ b/libs/uilib/uilib.cpp
@@ -11,10 +11,17 @@
 
 namespace ui {
 
-    void init(int argc, char *argv[])
+    bool init(int *argc, char **argv[], char const *parameter_string, char const **error)
     {
         gtk_disable_setlocale();
-        gtk_init(&argc, &argv);
+        static GOptionEntry entries[] = {{NULL}};
+        char const *translation_domain = NULL;
+        GError *gerror = NULL;
+        bool ret = gtk_init_with_args(argc, argv, parameter_string, entries, translation_domain, &gerror) != 0;
+        if (!ret) {
+            *error = gerror->message;
+        }
+        return ret;
     }
 
     void main()

diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
index 72470990ea8cf7c5e4804a377ae8038de97c7c58..511a40c31e731cdd20a4a00df9de6ae0f7ac7044 100644 (file)
--- a/libs/uilib/uilib.h
+++ b/libs/uilib/uilib.h
@@ -76,7 +76,7 @@ struct ModalDialog;
 
 namespace ui {
 
-    void init(int argc, char *argv[]);
+    bool init(int *argc, char **argv[], char const *parameter_string, char const **error);
 
     void main();
 

diff --git a/radiant/main.cpp b/radiant/main.cpp
index 975cb208fc56bb60ab81c1ce3e7640e35c2e48a1..f86b18951048f3313831b64686a602fd58ba19b9 100644 (file)
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -558,15 +558,10 @@ int main( int argc, char* argv[] ){
        }
 #endif
 
-       static GOptionEntry entries[] = {
-               { NULL }
-       };
-       GError *error = NULL;
        const char* mapname = NULL;
-
-       gtk_disable_setlocale();
-       if ( !gtk_init_with_args( &argc, &argv, "<filename.map>", entries, NULL, &error) ) {
-               g_print( "%s\n", error->message );
+    char const *error = NULL;
+       if ( !ui::init( &argc, &argv, "<filename.map>", &error) ) {
+               g_print( "%s\n", error );
                return -1;
        }