# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1190148858 -10800
# Node ID 5c6994da98c34ca564bb0598e361bbd5ca0dae58
# Parent  97b10cd95da26fd6926de356ebd35f284e089af7# Parent  21601ce39fa19f19152138c85d5321ff9564641e
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 97b10cd95da2 -r 5c6994da98c3 src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Tue Sep 18 23:53:57 2007 +0300
+++ b/src/audacious/ui_main.c	Tue Sep 18 23:54:18 2007 +0300
@@ -135,11 +135,10 @@
 static GtkWidget *mainwin_shuffle, *mainwin_repeat;
 GtkWidget *mainwin_eq, *mainwin_pl;
 
-GtkWidget *mainwin_info;
+GtkWidget *mainwin_info, *mainwin_othertext;
 GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
 
-static GtkWidget *mainwin_rate_text, *mainwin_freq_text,
-    *mainwin_othertext;
+static GtkWidget *mainwin_rate_text, *mainwin_freq_text;
 
 GtkWidget *mainwin_playstatus;
 
@@ -2438,6 +2437,7 @@
     g_signal_connect(mainwin_info, "right-clicked", mainwin_info_right_clicked_cb, NULL);
 
     mainwin_othertext = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, 112, 43, 153, 1, SKIN_TEXT);
+    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
 
     mainwin_rate_text = ui_skinned_textbox_new(SKINNED_WINDOW(mainwin)->fixed, 111, 43, 15, 0, SKIN_TEXT);
 
diff -r 97b10cd95da2 -r 5c6994da98c3 src/audacious/ui_main.h
--- a/src/audacious/ui_main.h	Tue Sep 18 23:53:57 2007 +0300
+++ b/src/audacious/ui_main.h	Tue Sep 18 23:54:18 2007 +0300
@@ -100,7 +100,7 @@
 
 extern GtkWidget *mainwin_jtf;
 extern GtkWidget *mainwin_eq, *mainwin_pl;
-extern GtkWidget *mainwin_info;
+extern GtkWidget *mainwin_info, *mainwin_othertext;
 
 extern GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
 
diff -r 97b10cd95da2 -r 5c6994da98c3 src/audacious/ui_preferences.c
--- a/src/audacious/ui_preferences.c	Tue Sep 18 23:53:57 2007 +0300
+++ b/src/audacious/ui_preferences.c	Tue Sep 18 23:54:18 2007 +0300
@@ -585,6 +585,7 @@
     cfg.mainwin_font = g_strdup(gtk_font_button_get_font_name(button));
 
     ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
+    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
 }
 
 static void
@@ -602,6 +603,7 @@
     gboolean useit = gtk_toggle_button_get_active(button);
     cfg.mainwin_use_xfont = useit != FALSE ? FALSE : TRUE;
     ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font);
+    ui_skinned_textbox_set_xfont(mainwin_othertext, cfg.mainwin_use_xfont, cfg.mainwin_font);
     playlistwin_set_sinfo_font(cfg.playlist_font);
 
     if (cfg.playlist_shaded) {