Enable chat clickable weblinks by default (#12115)

Co-authored-by: rubenwardy <rw@rubenwardy.com>

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index e3589d76f0f6256e98e86ce990601f2eaa8f4337..ff69d97412768cbc4d8c4e457edb989a4dd5203a 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -988,7 +988,7 @@ mute_sound (Mute sound) bool false
 [Client]
 
 #    Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console output.
-clickable_chat_weblinks (Chat weblinks) bool false
+clickable_chat_weblinks (Chat weblinks) bool true
 
 #    Optional override for chat weblink color.
 chat_weblink_color (Weblink color) string

diff --git a/minetest.conf.example b/minetest.conf.example
index 68757680c3961d6884b5ddb6fa4aab91029f63ae..4b4bda0c5e33b8894653563671f1e567d88f341c 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -1176,7 +1176,7 @@
 
 #    Clickable weblinks (middle-click or Ctrl+left-click) enabled in chat console output.
 #    type: bool
-# clickable_chat_weblinks = false
+# clickable_chat_weblinks = true
 
 #    Optional override for chat weblink color.
 #    type: string

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index b86287157b2ff2ddca34a321e994bc0e16524349..11d52efd3dc0d70b26097e0a8609f7379e0a7f6f 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -65,7 +65,6 @@ void set_default_settings()
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
        settings->setDefault("enable_register_confirmation", "true");
-       settings->setDefault("clickable_chat_weblinks", "false");
        settings->setDefault("chat_weblink_color", "#8888FF");
 
        // Keymap
@@ -465,6 +464,9 @@ void set_default_settings()
        settings->setDefault("touchscreen_threshold","20");
        settings->setDefault("fixed_virtual_joystick", "false");
        settings->setDefault("virtual_joystick_triggers_aux1", "false");
+       settings->setDefault("clickable_chat_weblinks", "false");
+#else
+       settings->setDefault("clickable_chat_weblinks", "true");
 #endif
        // Altered settings for Android
 #ifdef __ANDROID__