patches/gnome-settings-daemon-10-use-default-dpi.diff
author erwannc
Tue, 08 Jul 2008 20:17:41 +0000
branchgnome-2-22
changeset 12457 940597fff286
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12457
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     1
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
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     2
--- ../gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in	2008-07-08 22:11:42.193135824 +0200
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     3
+++ gnome-settings-daemon-2.22.2.1/data/desktop_gnome_font_rendering.schemas.in	2008-07-08 22:13:17.821803625 +0200
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     4
@@ -6,6 +6,7 @@
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     5
 	    <applyto>/desktop/gnome/font_rendering/dpi</applyto>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     6
             <owner>gnome</owner>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     7
 	    <type>float</type>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     8
+	    <default>96</default>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     9
             <locale name="C">
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    10
 	        <short>DPI</short>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    11
                 <long>
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    12
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
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    13
--- ../gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c	2008-07-08 22:11:42.199879692 +0200
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    14
+++ gnome-settings-daemon-2.22.2.1/plugins/xsettings/gsd-xsettings-manager.c	2008-07-08 22:12:41.357744656 +0200
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    15
@@ -238,7 +238,7 @@ get_dpi_from_gconf_or_x_server (GConfCli
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    16
         GConfValue *value;
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    17
         double      dpi;
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    18
 
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    19
-        value = gconf_client_get_without_default (client, FONT_DPI_KEY, NULL);
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    20
+        value = gconf_client_get (client, FONT_DPI_KEY, NULL);
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    21
 
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    22
         /* If the user has ever set the DPI preference in GConf, we use that.
940597fff286 2008-07-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    23
          * Otherwise, we see if the X server reports a reasonable DPI value:  some X