From 1d829875363f54dbdf048380c84e771491296ea3 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Sun, 16 Feb 2003 16:58:05 +0000
Subject: fix my breakage (broke non-latin1 installs :/)

---
 perl-install/install_gtk.pm       | 25 +++++++++++++++----------
 perl-install/install_steps_gtk.pm |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index 810ecdea7..d6762ed41 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -63,6 +63,20 @@ sub load_rc {
 
 }
 
+#------------------------------------------------------------------------------
+sub load_font {
+    my ($o) = @_;
+    Gtk2::Rc->parse_string(q(
+style "default-font" 
+{
+   font_name = ") . lang::l2pango_font($o->{locale}{lang}) . q( 12"
+}
+widget "*" style "default-font"
+
+));
+}
+
+#------------------------------------------------------------------------------
 sub default_theme {
     my ($o) = @_;
     $o->{meta_class} eq 'desktop' ? 'blue' :
@@ -70,21 +84,12 @@ sub default_theme {
       $o->{simple_themes} || $o->{vga16} ? 'blue' : 'galaxy';
 }
 
-#------------------------------------------------------------------------------
 sub install_theme {
     my ($o) = @_;
 
     $o->{theme} ||= default_theme($o);
     load_rc($o, "themes-$o->{theme}");
-
-    Gtk2::Rc->parse_string(q(
-style "default-font" 
-{
-   font_name = ") . lang::l2pango_font($o->{locale}{lang}) . q( 12"
-}
-widget "*" style "default-font"
-
-));
+    load_font($o);
     gtkset_background(@background) unless $::live; #- || testing;
 }
 
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 34043ec7d..bd90b37a5 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -150,6 +150,7 @@ sub leavingStep {
 sub charsetChanged {
     my ($o) = @_;
     Gtk2->set_locale;
+    install_gtk::load_font($o);
     install_gtk::update_steps_labels($o);
 }
 
-- 
cgit v1.2.1