changeset 1789:869c0ae9f61b trunk

[svn] - i made an oops
author nenolod
date Wed, 04 Oct 2006 18:51:58 -0700
parents 80b6282a31ae
children d3293e214422
files ChangeLog audacious/mainwin.c
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 04 18:48:49 2006 -0700
+++ b/ChangeLog	Wed Oct 04 18:51:58 2006 -0700
@@ -1,3 +1,13 @@
+2006-10-05 01:48:49 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2533]
+  - implement mainwinOthertextIsStatus property.
+  
+  trunk/audacious/mainwin.c      |   18 ++++++++++++++++--
+  trunk/audacious/widgets/skin.c |   11 +++++++++--
+  trunk/audacious/widgets/skin.h |    2 ++
+  3 files changed, 27 insertions(+), 4 deletions(-)
+
+
 2006-10-05 01:21:40 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2531]
   - update hints file
--- a/audacious/mainwin.c	Wed Oct 04 18:48:49 2006 -0700
+++ b/audacious/mainwin.c	Wed Oct 04 18:51:58 2006 -0700
@@ -785,9 +785,9 @@
 {
     mainwin_info_text_locked = TRUE;
     mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ?
-	mainwin_othertext->tb_text ? mainwin_info->tb_text);
+	mainwin_othertext->tb_text : mainwin_info->tb_text);
     textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ?
-	mainwin_othertext ? mainwin_info, text);
+	mainwin_othertext : mainwin_info, text);
 }
 
 void
@@ -798,7 +798,7 @@
     if (mainwin_tb_old_text != NULL)
     {
         textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ?
-  	    mainwin_othertext ? mainwin_info, text);
+  	    mainwin_othertext : mainwin_info, text);
         g_free(mainwin_tb_old_text);
         mainwin_tb_old_text = NULL;
     }