[gsettings-desktop-schemas] Use Cantarell by default as the UI font

[Bastien Nocera <hadess src gnome org>]

commit 71df55e7790b253f0da15c628fd6a140400ec76c
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Feb 8 20:56:09 2011 +0000

    Use Cantarell by default as the UI font
    
    https://bugzilla.gnome.org/show_bug.cgi?id=641549

 schemas/gsettings-desktop-schemas.convert          |    3 ++-
 .../org.gnome.desktop.interface.gschema.xml.in.in  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
index a536e51..5d2f68a 100644
--- a/schemas/gsettings-desktop-schemas.convert
+++ b/schemas/gsettings-desktop-schemas.convert
@@ -65,7 +65,8 @@ icon-theme = /desktop/gnome/interface/icon_theme
 #gtk-theme = /desktop/gnome/interface/gtk_theme
 #cursor-theme = /desktop/gnome/peripherals/mouse/cursor_theme
 gtk-key-theme = /desktop/gnome/interface/gtk_key_theme
-font-name = /desktop/gnome/interface/font_name
+# Disabled as we want users to use the new theme by default
+#font-name = /desktop/gnome/interface/font_name
 gtk-im-preedit-style = /desktop/gnome/interface/gtk-im-preedit-style
 gtk-im-status-style = /desktop/gnome/interface/gtk-im-status-style
 gtk-im-module = /desktop/gnome/interface/gtk-im-module
diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in.in b/schemas/org.gnome.desktop.interface.gschema.xml.in.in
index 2021916..a3467ec 100644
--- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in
@@ -118,7 +118,7 @@
       </_description>
     </key>
     <key name="font-name" type="s">
-      <default>'Sans 10'</default>
+      <default>'Cantarell 10'</default>
       <_summary>Default font</_summary>
       <_description>
         Name of the default font used by gtk+.