changeset 3028:d62ad9e400e3

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Tue, 10 Jul 2007 11:42:09 -0500
parents 16bd351fa0b9 (current diff) e9e925c3adb5 (diff)
children 1be4df6e4ae3
files
diffstat 3 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/ui_main.c	Tue Jul 10 11:41:56 2007 -0500
+++ b/src/audacious/ui_main.c	Tue Jul 10 11:42:09 2007 -0500
@@ -394,7 +394,6 @@
         if (cfg.player_shaded && cfg.player_visible)
             svis_clear(mainwin_svis);
         else {
-            ui_vis_clear(mainwin_vis);
             ui_vis_set_visible(mainwin_vis, FALSE);
         }
     }
@@ -976,9 +975,8 @@
     gtk_widget_hide(mainwin_othertext);
 
     playlistwin_hide_timer();
+    ui_vis_clear_data(mainwin_vis);
     draw_main_window(TRUE);
-
-    ui_vis_clear(mainwin_vis);
 }
 
 void
--- a/src/audacious/ui_vis.c	Tue Jul 10 11:41:56 2007 -0500
+++ b/src/audacious/ui_vis.c	Tue Jul 10 11:42:09 2007 -0500
@@ -590,13 +590,6 @@
         gtk_widget_queue_resize(widget);
 }
 
-void ui_vis_clear(GtkWidget *widget) {
-    UiVis *vis = UI_VIS (widget);
-        gdk_window_clear_area(widget->window, 0,
-                              0, vis->width,
-                              vis->height);
-}
-
 void ui_vis_clear_data(GtkWidget *widget) {
     gint i;
     UiVis *vis = UI_VIS (widget);
--- a/src/audacious/ui_vis.h	Tue Jul 10 11:41:56 2007 -0500
+++ b/src/audacious/ui_vis.h	Tue Jul 10 11:42:09 2007 -0500
@@ -87,7 +87,6 @@
 GtkType ui_vis_get_type(void);
 void ui_vis_set_vis(GtkWidget *widget, gint num);
 void ui_vis_clear_data(GtkWidget *widget);
-void ui_vis_clear(GtkWidget *widget);
 void ui_vis_timeout_func(GtkWidget *widget, guchar * data);
 void ui_vis_set_visible(GtkWidget *widget, gboolean window_is_visible);