Mercurial > audlegacy

changeset 1832:1c7e25c619e9 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - fix that goddamn skinlist bug
author nenolod
date Thu, 05 Oct 2006 07:57:40 -0700
parents b95792253a9d
children 3da01efb3225
files ChangeLog audacious/glade/prefswin.glade audacious/prefswin.c
diffstat 3 files changed, 14 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- 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 <nenolod@nenolod.net>
+  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 <nenolod@nenolod.net>
   revision [2617]
   - fix skins/Makefile
--- 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 @@
 				  <property name="fixed_height_mode">False</property>
 				  <property name="hover_selection">False</property>
 				  <property name="hover_expand">False</property>
-				  <signal name="realize" handler="skin_view_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 05:07:38 GMT"/>
-				  <signal name="visibility_notify_event" handler="on_skin_view_visibility_notify" last_modification_time="Sun, 11 Jul 2004 09:56:37 GMT"/>
+				  <signal name="realize" handler="on_skin_view_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 05:07:38 GMT"/>
 				</widget>
 			      </child>
 			    </widget>
--- 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);
 }