xfce/app/xfce4-settings/patches/010-fix-xfsettingsd-segfault.patch

   1 diff --git a/xfsettingsd/registry.c b/xfsettingsd/registry.c
   2 index e868685..d2da4a1 100644
   3 --- a/xfsettingsd/registry.c
   4 +++ b/xfsettingsd/registry.c
   5 @@ -302,13 +302,15 @@ xsettings_registry_store_xrdb(XSettingsRegistry *registry)
   6      if (G_LIKELY (filename))
   7      {
   8          /* create file contents */
   9 +        const gchar *xft_rgba = g_value_get_string (&properties[XSETTING_ENTRY_XFT_RGBA].value);
  10 +
  11          string = g_string_sized_new (80);
  12          g_string_append_printf (string, "Xft.antialias: %d\n"
  13                                          "Xft.hinting: %d\n"
  14                                          "Xft.rgba: %s\n",
  15                                          g_value_get_int (&properties[XSETTING_ENTRY_XFT_ANTIALIAS].value),
  16                                          g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value),
  17 -                                        g_value_get_string (&properties[XSETTING_ENTRY_XFT_RGBA].value));
  18 +                                        xft_rgba ? xft_rgba : "");
  19
  20          if (g_value_get_int (&properties[XSETTING_ENTRY_XFT_HINTING].value))
  21              g_string_append_printf (string, "Xft.hintstyle: %s\n", g_value_get_string (&properties[XSETTING_ENTRY_XFT_HINTSTYLE].value));
  22 @@ -355,10 +357,12 @@ xsettings_registry_store_xrdb(XSettingsRegistry *registry)
  23      if (G_LIKELY (filename))
  24      {
  25          /* build file contents */
  26 +        const gchar *cursor_theme_name = g_value_get_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value);
  27 +
  28          contents = g_strdup_printf ("Xcursor.theme: %s\n"
  29                                      "Xcursor.theme_core: true\n"
  30                                      "Xcursor.size: %d\n",
  31 -                                    g_value_get_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value),
  32 +                                    cursor_theme_name ? cursor_theme_name : "",
  33                                      g_value_get_int (&properties[XSETTING_ENTRY_GTK_CURSORTHEMESIZE].value));
  34
  35          /* write the contents to the file */