sugar/trunk/dont-overwrite-settings.patch

   1 diff -Naur sugar-0.117.orig/src/jarabe/main.py sugar-0.117/src/jarabe/main.py
   2 --- sugar-0.117.orig/src/jarabe/main.py 2020-03-17 01:02:30.000000000 +0100
   3 +++ sugar-0.117/src/jarabe/main.py      2020-05-27 21:38:18.454003200 +0200
   4 @@ -188,7 +188,7 @@
   5      global _metacity_process, _metacity_sid
   6
   7      _metacity_process = subprocess.Popen(
   8 -        ['metacity', '--no-force-fullscreen', '--no-composite'],
   9 +        ['metacity', '--no-force-fullscreen'],
  10          stdout=subprocess.PIPE)
  11      _metacity_sid = GLib.io_add_watch(_metacity_process.stdout, GLib.IO_HUP,
  12                                        __window_manager_failed_cb)
  13 @@ -196,12 +196,6 @@
  14
  15
  16  def _start_window_manager():
  17 -    global _cursor_theme_settings, _cursor_theme
  18 -
  19 -    _cursor_theme_settings = Gio.Settings.new('org.gnome.desktop.interface')
  20 -    _cursor_theme = _cursor_theme_settings.get_string('cursor-theme')
  21 -    _cursor_theme_settings.set_string('cursor-theme', 'sugar')
  22 -
  23      _restart_window_manager()
  24
  25      screen = Wnck.Screen.get_default()
  26 @@ -211,7 +205,6 @@
  27
  28
  29  def _stop_window_manager():
  30 -    _cursor_theme_settings.set_string('cursor-theme', _cursor_theme)
  31      _metacity_process.terminate()
  32
  33