rpms/control-center/F-11 font-gconf-trouble.patch, NONE, 1.1 control-center.spec, 1.447, 1.448

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6375

Modified Files:
	control-center.spec 
Added Files:
	font-gconf-trouble.patch 
Log Message:
try to fix the 'jumping dpi' problem


font-gconf-trouble.patch:

--- NEW FILE font-gconf-trouble.patch ---
--- gnome-control-center-2.26.0/capplets/appearance/appearance-font.c	2009-03-16 11:14:59.000000000 -0400
+++ hacked/capplets/appearance/appearance-font.c	2009-05-09 00:10:29.137078409 -0400
@@ -390,20 +390,20 @@
 font_radio_toggled (GtkToggleButton *toggle_button,
 		    FontPair        *pair)
 {
-  GConfClient *client = gconf_client_get_default ();
-
   if (!in_change) {
+    GConfClient *client = gconf_client_get_default ();
+
     gconf_client_set_string (client, FONT_ANTIALIASING_KEY,
 			     gconf_enum_to_string (antialias_enums, pair->antialiasing),
 			     NULL);
     gconf_client_set_string (client, FONT_HINTING_KEY,
 			     gconf_enum_to_string (hint_enums, pair->hinting),
 			     NULL);
-  }
 
-  /* Restore back to the previous state until we get notification */
-  font_render_load (client);
-  g_object_unref (client);
+    /* Restore back to the previous state until we get notification */
+    font_render_load (client);
+    g_object_unref (client);
+  }
 }
 
 static void
@@ -792,11 +792,13 @@
    * If the user changes the value faster than responses are
    * received from GConf, this may cause mildly strange effects.
    */
-  gdouble new_dpi = gtk_spin_button_get_value (spinner);
+  if (!in_change) {
+    gdouble new_dpi = gtk_spin_button_get_value (spinner);
 
-  gconf_client_set_float (client, FONT_DPI_KEY, new_dpi, NULL);
+    gconf_client_set_float (client, FONT_DPI_KEY, new_dpi, NULL);
 
-  dpi_load (client, spinner);
+    dpi_load (client, spinner);
+  }
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/control-center.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -p -r1.447 -r1.448
--- control-center.spec	30 Apr 2009 02:25:40 -0000	1.447
+++ control-center.spec	9 May 2009 13:26:28 -0000	1.448
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -62,6 +62,9 @@ Patch36: display-capplet-mnemonics.patch
 
 Patch37: gcc-xkb-init.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=581986
+Patch38: font-gconf-trouble.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -188,6 +191,7 @@ utilities.
 %patch35 -p1 -b .support-touchpads
 %patch36 -p1 -b .mnemonics
 %patch37 -p1 -b .xkb-init
+%patch38 -p1 -b .font-gconf-trouble
 pushd capplets/about-me
 mv *png icons/
 popd
@@ -363,6 +367,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat May  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-7
+- Try to fix the 'jumping dpi' problem
+
 * Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-6
 - Don't rely on _BACKUP property for xkb initialization