# HG changeset patch
# User nenolod
# Date 1160012929 25200
# Node ID 80b6282a31ae4fd9d2096309d383ac9c97775d32
# Parent  d1ef4890fb44647b8cdb860645762f5869c1bc1b
[svn] - implement mainwinOthertextIsStatus property.

diff -r d1ef4890fb44 -r 80b6282a31ae ChangeLog
--- a/ChangeLog	Wed Oct 04 18:21:40 2006 -0700
+++ b/ChangeLog	Wed Oct 04 18:48:49 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-05 01:21:40 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2531]
+  - update hints file
+  
+  trunk/skin/skin.hints |    1 +
+  1 file changed, 1 insertion(+)
+
+
 2006-10-04 23:00:03 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2529]
   - add:
diff -r d1ef4890fb44 -r 80b6282a31ae audacious/mainwin.c
--- a/audacious/mainwin.c	Wed Oct 04 18:21:40 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 18:48:49 2006 -0700
@@ -778,18 +778,32 @@
     }
 }
 
+static gchar *mainwin_tb_old_text = NULL;
+
 void
 mainwin_lock_info_text(const gchar * text)
 {
     mainwin_info_text_locked = TRUE;
-    textbox_set_text(mainwin_info, text);
+    mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ?
+	mainwin_othertext->tb_text ? mainwin_info->tb_text);
+    textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ?
+	mainwin_othertext ? mainwin_info, text);
 }
 
 void
 mainwin_release_info_text(void)
 {
     mainwin_info_text_locked = FALSE;
-    mainwin_set_info_text();
+
+    if (mainwin_tb_old_text != NULL)
+    {
+        textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ?
+  	    mainwin_othertext ? mainwin_info, text);
+        g_free(mainwin_tb_old_text);
+        mainwin_tb_old_text = NULL;
+    }
+    else
+        mainwin_set_info_text();	/* XXX: best we can do */
 }
 
 
diff -r d1ef4890fb44 -r 80b6282a31ae audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Wed Oct 04 18:21:40 2006 -0700
+++ b/audacious/widgets/skin.c	Wed Oct 04 18:48:49 2006 -0700
@@ -765,8 +765,7 @@
         g_free(tmp);
     }
 
-
-    tmp = read_ini_string(filename, "skin", "mainwinPositionX");
+    tmp = read_ini_string(filename, "skin", "mainwinPositionY");
 
     if (tmp != NULL)
     {
@@ -774,6 +773,14 @@
         g_free(tmp);
     }
 
+    tmp = read_ini_string(filename, "skin", "mainwinOthertextIsStatus");
+
+    if (tmp != NULL)
+    {
+        skin->properties.mainwin_othertext_is_status = atoi(tmp);
+        g_free(tmp);
+    }
+
     g_free(filename);
 }
 
diff -r d1ef4890fb44 -r 80b6282a31ae audacious/widgets/skin.h
--- a/audacious/widgets/skin.h	Wed Oct 04 18:21:40 2006 -0700
+++ b/audacious/widgets/skin.h	Wed Oct 04 18:48:49 2006 -0700
@@ -110,6 +110,8 @@
 	gint mainwin_position_y;
 
 	gboolean mainwin_menurow_visible;
+
+	gboolean mainwin_othertext_is_status;
 } SkinProperties;
 
 #define SKIN_PIXMAP(x)  ((SkinPixmap *)(x))