From c320047e7abbe972f850b2cfee1f574e86e9bd35 Mon Sep 17 00:00:00 2001
From: Live System User <liveuser@localhost.localdomain>
Date: Mon, 31 Oct 2011 17:01:38 +0000
Subject: Version 6  10/29/11  Cosmetic change only

---
diff --git a/activity/activity.info b/activity/activity.info
index fec563e..ec11874 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,7 +5,7 @@ name = OurMusic
 bundle_id = org.laptop.OurMusic
 icon = activity-ourmusic
 
-activity_version = 5
+activity_version = 6
 
 host_version = 1
 
diff --git a/csndsugui.py b/csndsugui.py
index c196629..f606a8b 100755
--- a/csndsugui.py
+++ b/csndsugui.py
@@ -65,11 +65,7 @@ class BasicGUI:
           mult = width * .00132
         elif release.find("SoaS release 2 ") != -1:
           mult = width * .00085
-<<<<<<< HEAD
         elif release.find("Fedora release ") != -1:
-=======
-        elif release.find("SoaS release 3 ") != -1:
->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a
           mult = width * .00119
       font.set_size(int(font_size * mult))
       widget.modify_font(font)
@@ -148,8 +144,8 @@ class BasicGUI:
             i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x8000,0x8000,0x8000, 2))
           else:
             i[2] = 1
-            i[0].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0xFFFF,0,0, 1))
-            i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0xFFFF,0,0, 2))
+            i[0].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0x7700,0, 1))
+            i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0,0x7700,0, 2))
           self.set_channel(i[1], i[2])  
 
     def button_setvalue(self, widget, value):
diff --git a/ourmusic.py b/ourmusic.py
index 5fd7f4d..ec81af5 100755
--- a/ourmusic.py
+++ b/ourmusic.py
@@ -11,7 +11,7 @@
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# version 5  6/8/10  Cosmetic change only
+# version 6  10/29/11  Cosmetic change only
 #
 #    Notes:
 #
--
cgit v0.9.1