# HG changeset patch
# User nenolod
# Date 1162777559 28800
# Node ID 4f869110ac7b88ced77b95b611faf9a2063ba781
# Parent  78e8d9dd5036b79e3912bb0fb9fe219bc251eb05
[svn] - do not evaluate mainwinHeight() or mainwinWidth() in skin scripts if doublesize is on

diff -r 78e8d9dd5036 -r 4f869110ac7b ChangeLog
--- a/ChangeLog	Sun Nov 05 15:09:25 2006 -0800
+++ b/ChangeLog	Sun Nov 05 17:45:59 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-05 23:09:25 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2853]
+  - only use g_unichar_iswide_cjk if GLib 2.12 is available.
+  
+  trunk/audtool/audtool.c |    5 ++++-
+  1 file changed, 4 insertions(+), 1 deletion(-)
+
+
 2006-11-05 22:27:21 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2851]
   - remove symbols relating to GNOME_VFS
diff -r 78e8d9dd5036 -r 4f869110ac7b audacious/mainwin.c
--- a/audacious/mainwin.c	Sun Nov 05 15:09:25 2006 -0800
+++ b/audacious/mainwin.c	Sun Nov 05 17:45:59 2006 -0800
@@ -1031,6 +1031,9 @@
     else
         widget_hide(WIDGET(mainwin_vis));
 
+    if (cfg.doublesize)
+        return;
+
     /* window size, mainwinWidth && mainwinHeight properties */
     if (bmp_active_skin->properties.mainwin_height && bmp_active_skin->properties.mainwin_width)
     {
@@ -1038,12 +1041,6 @@
 
 	gdk_window_get_size(mainwin->window, &width, &height);
 
-	if (width == bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1) &&
-		height == bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1))
-	{
-		return;
-	}
-
         dock_window_resize(GTK_WINDOW(mainwin), cfg.player_shaded ? MAINWIN_SHADED_WIDTH : bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),
 		cfg.player_shaded ? MAINWIN_SHADED_HEIGHT : bmp_active_skin->properties.mainwin_height * (cfg.doublesize + 1),
 		bmp_active_skin->properties.mainwin_width * (cfg.doublesize + 1),