--- src/dh-preferences.c	2011-08-21 12:00:05.000000000 +0200
+++ src/dh-preferences.c	2011-12-31 22:09:34.282816617 +0100
@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void
 }
 #endif
 
-/* FIXME: Use the functions in dh-util.c for this. */
 static void
 preferences_fonts_get_font_names (gboolean   use_system_fonts,
                                   gchar    **variable,
                                   gchar    **fixed)
 {
-	gchar   *var_font_name;
-        gchar   *fixed_font_name;
-	IgeConf *conf;
-
-	conf = ige_conf_get ();
+        gchar   *name;
+        gdouble  size;
 
-	if (use_system_fonts) {
-#ifdef GDK_WINDOWING_QUARTZ
-                var_font_name = g_strdup ("Lucida Grande 14");
-                fixed_font_name = g_strdup ("Monaco 14");
-#else
-		ige_conf_get_string (conf,
-                                     DH_CONF_SYSTEM_VARIABLE_FONT,
-                                     &var_font_name);
-		ige_conf_get_string (conf,
-                                     DH_CONF_SYSTEM_FIXED_FONT,
-                                     &fixed_font_name);
-#endif
-	} else {
-		ige_conf_get_string (conf,
-                                     DH_CONF_VARIABLE_FONT,
-                                     &var_font_name);
-                ige_conf_get_string (conf,
-                                     DH_CONF_FIXED_FONT,
-                                     &fixed_font_name);
-	}
+	dh_util_font_get_variable (&name, &size, use_system_fonts);
+	*variable = g_strdup_printf ("%s %u", name, (guint)size);
+	g_free (name);
 
-	*variable = var_font_name;
-	*fixed = fixed_font_name;
+	dh_util_font_get_fixed (&name, &size, use_system_fonts);
+	*fixed = g_strdup_printf ("%s %u", name, (guint)size);
+	g_free (name);
 }
 
 static void
--- src/dh-util.c	2011-08-21 12:00:05.000000000 +0200
+++ src/dh-util.c	2011-12-31 22:04:29.618797149 +0100
@@ -637,6 +637,7 @@ dh_util_font_get_variable (gchar    **na
 {
 	IgeConf *conf;
 	gchar   *name_and_size;
+	GSettings *settings;
 
 	conf = ige_conf_get ();
 
@@ -644,9 +645,9 @@ dh_util_font_get_variable (gchar    **na
 #ifdef GDK_WINDOWING_QUARTZ
                 name_and_size = g_strdup ("Lucida Grande 14");
 #else
-		ige_conf_get_string (conf,
-                                     DH_CONF_SYSTEM_VARIABLE_FONT,
-                                     &name_and_size);
+		settings = g_settings_new ("org.gnome.desktop.interface");
+		name_and_size = g_settings_get_string (settings, "font-name");
+		g_object_unref (settings);
 #endif
 	} else {
 		ige_conf_get_string (conf,
@@ -669,6 +670,7 @@ dh_util_font_get_fixed (gchar    **name,
 {
 	IgeConf *conf;
 	gchar   *name_and_size;
+	GSettings *settings;
 
 	conf = ige_conf_get ();
 
@@ -676,9 +678,9 @@ dh_util_font_get_fixed (gchar    **name,
 #ifdef GDK_WINDOWING_QUARTZ
                 name_and_size = g_strdup ("Monaco 14");
 #else
-		ige_conf_get_string (conf,
-                                     DH_CONF_SYSTEM_FIXED_FONT,
-                                     &name_and_size);
+		settings = g_settings_new ("org.gnome.desktop.interface");
+		name_and_size = g_settings_get_string (settings, "monospace-font-name");
+		g_object_unref (settings);
 #endif
 	} else {
 		ige_conf_get_string (conf,
