# HG changeset patch # User Tomasz Mon # Date 1190988621 -7200 # Node ID 9e4edc01a0e3a37cb6ba876fd0f933caa87e27d6 # Parent 75372888e0650225e40d70df5f423bd0805ae8e3 I don't quite have idea how to make everyone happy with this - reverting 23824a113182 as for now diff -r 75372888e065 -r 9e4edc01a0e3 src/audacious/ui_main.c --- a/src/audacious/ui_main.c Thu Sep 27 22:06:11 2007 +0200 +++ b/src/audacious/ui_main.c Fri Sep 28 16:10:21 2007 +0200 @@ -134,10 +134,11 @@ static GtkWidget *mainwin_shuffle, *mainwin_repeat; GtkWidget *mainwin_eq, *mainwin_pl; -GtkWidget *mainwin_info, *mainwin_othertext; +GtkWidget *mainwin_info; GtkWidget *mainwin_stime_min, *mainwin_stime_sec; -static GtkWidget *mainwin_rate_text, *mainwin_freq_text; +static GtkWidget *mainwin_rate_text, *mainwin_freq_text, + *mainwin_othertext; GtkWidget *mainwin_playstatus; @@ -2446,7 +2447,6 @@ 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 75372888e065 -r 9e4edc01a0e3 src/audacious/ui_main.h --- a/src/audacious/ui_main.h Thu Sep 27 22:06:11 2007 +0200 +++ b/src/audacious/ui_main.h Fri Sep 28 16:10:21 2007 +0200 @@ -99,7 +99,7 @@ extern GtkWidget *mainwin_jtf; extern GtkWidget *mainwin_eq, *mainwin_pl; -extern GtkWidget *mainwin_info, *mainwin_othertext; +extern GtkWidget *mainwin_info; extern GtkWidget *mainwin_stime_min, *mainwin_stime_sec; diff -r 75372888e065 -r 9e4edc01a0e3 src/audacious/ui_preferences.c --- a/src/audacious/ui_preferences.c Thu Sep 27 22:06:11 2007 +0200 +++ b/src/audacious/ui_preferences.c Fri Sep 28 16:10:21 2007 +0200 @@ -585,7 +585,6 @@ 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 @@ -603,7 +602,6 @@ 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) {