--- a/ChangeLog	Mon Jul 07 15:33:14 2008 +0000
+++ b/ChangeLog	Tue Jul 08 20:17:41 2008 +0000
@@ -1,3 +1,9 @@
+2008-07-08 Erwann Chenede - <[email protected]>
+
+	* patches/gnome-settings-daemon-10-use-default-dpi.diff: ported
+	  missing branding patch from 2.20
+	* base-specs/gnome-settings-daemon.spec: added patch
+
 2008-07-07  Damien Carbery <[email protected]>
 
 	* base-specs/w3m.spec: Add patch 01-disable-po to fix build issue.

--- a/base-specs/gnome-settings-daemon.spec	Mon Jul 07 15:33:14 2008 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Tue Jul 08 20:17:41 2008 +0000
@@ -40,6 +40,9 @@
 Patch8:       gnome-settings-daemon-08-gnomeinit.diff
 # date:2008-05-06 owner:lin type:branding bugster:6653199
 Patch9:       gnome-settings-daemon-09-esound-prefix-branding.diff
+# date:2008-01-24 owner:erwannc type:bug bugster:146
+Patch10:      gnome-settings-daemon-10-use-default-dpi.diff
+
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -107,6 +110,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Rename dir so that #include does not have to change on gnome-control-center.
 # Combines with patch mv-src-dir.diff (see bugzilla 511820).

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-10-use-default-dpi.diff	Tue Jul 08 20:17:41 2008 +0000
@@ -0,0 +1,23 @@
+diff -x '*.*~' -rup ../gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in
+--- ../gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in	2008-07-08 22:11:42.193135824 +0200
++++ gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in	2008-07-08 22:13:17.821803625 +0200
+@@ -6,6 +6,7 @@
+ 	    <applyto>/desktop/gnome/font_rendering/dpi</applyto>
+             <owner>gnome</owner>
+ 	    <type>float</type>
++	    <default>96</default>
+             <locale name="C">
+ 	        <short>DPI</short>
+                 <long>
+diff -x '*.*~' -rup ../gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c
+--- ../gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c	2008-07-08 22:11:42.199879692 +0200
++++ gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c	2008-07-08 22:12:41.357744656 +0200
+@@ -238,7 +238,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
+         GConfValue *value;
+         double      dpi;
+ 
+-        value = gconf_client_get_without_default (client, FONT_DPI_KEY, NULL);
++        value = gconf_client_get (client, FONT_DPI_KEY, NULL);
+ 
+         /* If the user has ever set the DPI preference in GConf, we use that.
+          * Otherwise, we see if the X server reports a reasonable DPI value:  some X