# HG changeset patch
# User nenolod
# Date 1160387898 25200
# Node ID c673508130a8283307169b4734897354ded51a2a
# Parent  a46b6465c7e5c449c05388d46bbd917ef51b000a
[svn] - replace several occurances of MAINWIN_WIDTH with bmp_active_skin->properties.mainwin_width.

diff -r a46b6465c7e5 -r c673508130a8 ChangeLog
--- a/ChangeLog	Sun Oct 08 18:17:58 2006 -0700
+++ b/ChangeLog	Mon Oct 09 02:58:18 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-09 01:17:58 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2651]
+  - update NEWS
+  
+  trunk/NEWS |   12 ++++++++++++
+  1 file changed, 12 insertions(+)
+
+
 2006-10-07 22:43:56 +0000  George Averill <nhjm449@gmail.com>
   revision [2649]
   - Make sure to redraw shaded playlistwin when toggling bitmap fonts.
diff -r a46b6465c7e5 -r c673508130a8 audacious/mainwin.c
--- a/audacious/mainwin.c	Sun Oct 08 18:17:58 2006 -0700
+++ b/audacious/mainwin.c	Mon Oct 09 02:58:18 2006 -0700
@@ -3467,7 +3467,7 @@
     gtk_window_set_role(GTK_WINDOW(mainwin), "player");
     gtk_window_set_resizable(GTK_WINDOW(mainwin), FALSE);
 
-    width = MAINWIN_WIDTH;
+    width = bmp_active_skin->properties.mainwin_width;
     height = cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height;
 
     gtk_widget_set_size_request(mainwin, width, height);
@@ -3557,7 +3557,8 @@
 
     mainwin_gc = gdk_gc_new(mainwin->window);
     mainwin_bg = gdk_pixmap_new(mainwin->window,
-                                MAINWIN_WIDTH, MAINWIN_HEIGHT, -1);
+                                bmp_active_skin->properties.mainwin_width,
+				bmp_active_skin->properties.mainwin_height, -1);
     mainwin_set_back_pixmap();
     mainwin_create_widgets();
 
diff -r a46b6465c7e5 -r c673508130a8 audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Sun Oct 08 18:17:58 2006 -0700
+++ b/audacious/widgets/skin.c	Mon Oct 09 02:58:18 2006 -0700
@@ -1772,5 +1772,5 @@
     }
 
     skin_draw_pixmap(skin, drawable, gc, SKIN_TITLEBAR, 27, y_offset,
-                     0, 0, MAINWIN_WIDTH, MAINWIN_TITLEBAR_HEIGHT);
+                     0, 0, bmp_active_skin->properties.mainwin_width, MAINWIN_TITLEBAR_HEIGHT);
 }