# HG changeset patch # User nenolod # Date 1160060260 25200 # Node ID 1c7e25c619e9a95cf722fdee15ada6eaa671b5e9 # Parent b95792253a9d8734e2b394c436f73ed336aeafdb [svn] - fix that goddamn skinlist bug diff -r b95792253a9d -r 1c7e25c619e9 ChangeLog --- a/ChangeLog Thu Oct 05 07:46:20 2006 -0700 +++ b/ChangeLog Thu Oct 05 07:57:40 2006 -0700 @@ -1,3 +1,12 @@ +2006-10-05 14:46:20 +0000 William Pitcock + revision [2619] + - oops + + trunk/skins/Default/Makefile | 6 +++--- + trunk/skins/TinyPlayer/Makefile | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + + 2006-10-05 14:44:19 +0000 William Pitcock revision [2617] - fix skins/Makefile diff -r b95792253a9d -r 1c7e25c619e9 audacious/glade/prefswin.glade --- a/audacious/glade/prefswin.glade Thu Oct 05 07:46:20 2006 -0700 +++ b/audacious/glade/prefswin.glade Thu Oct 05 07:57:40 2006 -0700 @@ -835,8 +835,7 @@ False False False - - + diff -r b95792253a9d -r 1c7e25c619e9 audacious/prefswin.c --- a/audacious/prefswin.c Thu Oct 05 07:46:20 2006 -0700 +++ b/audacious/prefswin.c Thu Oct 05 07:57:40 2006 -0700 @@ -1746,37 +1746,16 @@ skin_view_update(GTK_TREE_VIEW(widget), GTK_WIDGET(widget2)); } -static void -prefswin_set_skin_update(gboolean state) -{ - g_object_set_data(G_OBJECT(prefswin), "update-skins", - GINT_TO_POINTER(state)); -} - static gboolean -prefswin_get_skin_update(void) -{ - return g_object_get_data(G_OBJECT(prefswin), "update-skins") != 0; -} - -static gboolean -on_skin_view_visibility_notify(GtkTreeView * treeview, - GdkEvent * event, - gpointer data) +on_skin_view_realize(GtkTreeView * treeview, + gpointer data) { GladeXML *xml; GtkWidget *widget; - if (event->visibility.state == GDK_VISIBILITY_FULLY_OBSCURED) - return FALSE; - - if (!prefswin_get_skin_update()) - return FALSE; - - prefswin_set_skin_update(FALSE); - xml = prefswin_get_xml(); widget = glade_xml_get_widget(xml, "skin_refresh_button"); + skin_view_realize(treeview); skin_view_update(treeview, GTK_WIDGET(widget)); return TRUE; @@ -2158,7 +2137,7 @@ FUNC_MAP_ENTRY(on_playlist_no_advance_toggled) FUNC_MAP_ENTRY(on_refresh_file_list_realize) FUNC_MAP_ENTRY(on_refresh_file_list_toggled) - FUNC_MAP_ENTRY(on_skin_view_visibility_notify) + FUNC_MAP_ENTRY(on_skin_view_realize) FUNC_MAP_ENTRY(on_titlestring_entry_realize) FUNC_MAP_ENTRY(on_titlestring_entry_changed) FUNC_MAP_ENTRY(on_eq_dir_preset_entry_realize) @@ -2441,7 +2420,6 @@ void show_prefs_window(void) { - prefswin_set_skin_update(TRUE); gtk_widget_show(prefswin); }