From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 20 Feb 2023 15:40:09 +0000 (+0100)
Subject: Merge branch 'master' into master-merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abace91945a0d97539595103885884072f542dba;p=xonotic%2Fnetradiant.git

Merge branch 'master' into master-merge
---

abace91945a0d97539595103885884072f542dba
diff --cc radiant/main.cpp
index 20bea80f,87fa8470..1306de6c
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@@ -497,36 -495,9 +495,34 @@@ void user_shortcuts_init()
  }
  
  void user_shortcuts_save(){
- 	StringOutputStream path( 256 );
- 	path << SettingsPath_get() << g_pGameDescription->mGameFile.c_str() << '/';
- 	SaveCommandMap( path.c_str() );
+ 	SaveCommandMap();
  }
  
 +void add_local_rc_files(){
 +#define GARUX_DISABLE_GTKTHEME
 +#ifndef GARUX_DISABLE_GTKTHEME
 +/* FIXME: HACK: not GTK3 compatible
 + https://developer.gnome.org/gtk2/stable/gtk2-Resource-Files.html#gtk-rc-add-default-file
 + https://developer.gnome.org/gtk3/stable/gtk3-Resource-Files.html#gtk-rc-add-default-file
 + > gtk_rc_add_default_file has been deprecated since version 3.0 and should not be used in newly-written code.
 + > Use GtkStyleContext with a custom GtkStyleProvider instead
 +*/
 +
 +	{
 +		StringOutputStream path( 512 );
 +		path << AppPath_get() << ".gtkrc-2.0.radiant";
 +		gtk_rc_add_default_file( path.c_str() );
 +	}
 +#ifdef WIN32
 +	{
 +		StringOutputStream path( 512 );
 +		path << AppPath_get() << ".gtkrc-2.0.win";
 +		gtk_rc_add_default_file( path.c_str() );
 +	}
 +#endif
 +#endif // GARUX_DISABLE_GTKTHEME
 +}
 +
  /* HACK: If ui::main is not called yet,
  gtk_main_quit will not quit, so tell main
  to not call ui::main. This happens when a