# HG changeset patch
# User nenolod
# Date 1167804284 28800
# Node ID 7b568c86b2a9b4632f8861a99f4e2f3d059d273c
# Parent  d507d2c1f75caac717538f18fdb36a1a1ee973de
[svn] - fix sed

diff -r d507d2c1f75c -r 7b568c86b2a9 ChangeLog
--- a/ChangeLog	Tue Jan 02 22:03:33 2007 -0800
+++ b/ChangeLog	Tue Jan 02 22:04:44 2007 -0800
@@ -1,3 +1,35 @@
+2007-01-03 06:03:33 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3479]
+  - rename mainwin.c to ui_main.c and such
+  
+  trunk/audacious/Makefile            |    2 
+  trunk/audacious/controlsocket.c     |    2 
+  trunk/audacious/genevent.c          |    2 
+  trunk/audacious/genevent.h          |    2 
+  trunk/audacious/hints.c             |    2 
+  trunk/audacious/input.c             |    2 
+  trunk/audacious/main.c              |    2 
+  trunk/audacious/main.h              |    2 
+  trunk/audacious/mainwin.c           | 4018 ------------------------------------
+  trunk/audacious/mainwin.h           |  196 -
+  trunk/audacious/playback.c          |    2 
+  trunk/audacious/playlist.c          |    2 
+  trunk/audacious/playlist_manager.c  |    2 
+  trunk/audacious/pluginenum.c        |    2 
+  trunk/audacious/prefswin.c          |    2 
+  trunk/audacious/signals.c           |    2 
+  trunk/audacious/ui_fileinfo.c       |    2 
+  trunk/audacious/ui_main.c           | 4018 ++++++++++++++++++++++++++++++++++++
+  trunk/audacious/ui_main.h           |  196 +
+  trunk/audacious/ui_manager.c        |    4 
+  trunk/audacious/ui_playlist.c       |    2 
+  trunk/audacious/ui_playlist.h       |    2 
+  trunk/audacious/widgets/eq_slider.c |    2 
+  trunk/audacious/widgets/skin.c      |   14 
+  trunk/audacious/widgets/svis.c      |    2 
+  25 files changed, 4242 insertions(+), 4242 deletions(-)
+
+
 2007-01-03 05:57:04 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3477]
   - rename equalizer.c to ui_equalizer.c
diff -r d507d2c1f75c -r 7b568c86b2a9 audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Tue Jan 02 22:03:33 2007 -0800
+++ b/audacious/widgets/skin.c	Tue Jan 02 22:04:44 2007 -0800
@@ -956,17 +956,17 @@
     /* XXX: use of skin_mask_info here is bad */
     skin_mask_info[0].width = skin->properties.mainwin_width;
 
-    skin->properties.ui_main.height = 116;
+    skin->properties.mainwin_height = 116;
     tmp = read_ini_string(filename, "skin", "mainwinHeight");
 
     if (tmp != NULL)
     {
-        skin->properties.ui_main.height = atoi(tmp);
+        skin->properties.mainwin_height = atoi(tmp);
         g_free(tmp);
     }
 
     /* XXX: use of skin_mask_info here is bad */
-    skin_mask_info[0].height = skin->properties.ui_main.height;
+    skin_mask_info[0].height = skin->properties.mainwin_height;
 
     skin->properties.mainwin_about_x = 247;
     tmp = read_ini_string(filename, "skin", "mainwinAboutX");