# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1199953525 21600
# Node ID e1e675e7d737f4ebb456aa991a9eca74a83628a1
# Parent  472aaaca02c01349d8a5dd547de5bf772b6b03c1# Parent  65bb64b7747ed26c87a3eb6e7da3d08b00ca0553
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 472aaaca02c0 -r e1e675e7d737 src/audacious/ui_playlist.c
--- a/src/audacious/ui_playlist.c	Thu Jan 10 02:25:01 2008 -0600
+++ b/src/audacious/ui_playlist.c	Thu Jan 10 02:25:25 2008 -0600
@@ -298,6 +298,7 @@
     gchar *tmp = NULL, *tmp2 = NULL;
 
     g_return_if_fail(font);
+    AUDDBG("Attempt to set font \"%s\"\n", font);
 
     tmp = g_strdup(font);
     g_return_if_fail(tmp);
diff -r 472aaaca02c0 -r e1e675e7d737 src/audacious/ui_preferences.c
--- a/src/audacious/ui_preferences.c	Thu Jan 10 02:25:01 2008 -0600
+++ b/src/audacious/ui_preferences.c	Thu Jan 10 02:25:25 2008 -0600
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif
 
+/* #define AUD_DEBUG */
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -589,16 +591,17 @@
 }
 
 static void
-on_font_btn_realize(GtkFontButton * button, gchar *cfg)
+on_font_btn_realize(GtkFontButton * button, gchar **cfg)
 {
-    gtk_font_button_set_font_name(button, cfg);
+    gtk_font_button_set_font_name(button, *cfg);
 }
 
 static void
-on_font_btn_font_set(GtkFontButton * button, gchar *cfg)
+on_font_btn_font_set(GtkFontButton * button, gchar **cfg)
 {
-    g_free(cfg);
-    cfg = g_strdup(gtk_font_button_get_font_name(button));
+    g_free(*cfg);
+    *cfg = g_strdup(gtk_font_button_get_font_name(button));
+    AUDDBG("Returned font name: \"%s\"\n", *cfg);
     void (*callback) (void) = g_object_get_data(G_OBJECT(button), "callback");
     if (callback) callback();
 }
@@ -612,6 +615,7 @@
 static void
 playlist_font_set_cb()
 {
+    AUDDBG("Attempt to set font \"%s\"\n", cfg.playlist_font);
     ui_skinned_playlist_set_font(cfg.playlist_font);
     playlistwin_set_sinfo_font(cfg.playlist_font);  /* propagate font setting to playlistwin_sinfo */
     playlistwin_update_list(playlist_get_active());
@@ -1775,10 +1779,10 @@
 
                 g_signal_connect(G_OBJECT(font_btn), "font_set",
                                  G_CALLBACK(on_font_btn_font_set),
-                                 *(char**)widgets[x].cfg);
+                                 (char**)widgets[x].cfg);
                 g_signal_connect(G_OBJECT(font_btn), "realize",
                                  G_CALLBACK(on_font_btn_realize),
-                                 *(char**)widgets[x].cfg);
+                                 (char**)widgets[x].cfg);
                 break;
             default:
                 /* shouldn't ever happen - expect things to break */