Author: duncan
Date: Sun Oct 22 03:43:31 2006
New Revision: 8448
Added:
branches/rel-1/freevo/share/images/mediaportal/background_my_recipies.png
- copied unchanged from r8447,
/branches/rel-1-6/freevo/share/images/mediaportal/background_my_recipies.png
Removed:
branches/rel-1/freevo/share/images/mediaportal/background_my recipies.png
Modified:
branches/rel-1/freevo/Docs/CREDITS
branches/rel-1/freevo/setup.py
branches/rel-1/freevo/src/audio/plugins/detach.py
Log:
Merged changes from rel-1-6
Modified: branches/rel-1/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1/freevo/Docs/CREDITS (original)
+++ branches/rel-1/freevo/Docs/CREDITS Sun Oct 22 03:43:31 2006
@@ -60,6 +60,10 @@
Occasional contributors:
------------------------
+Tanja Kotthaus <[EMAIL PROTECTED]>
+o idlebar diskfree plug-in
+o Various bug fixes
+
Hans Meine <[EMAIL PROTECTED]>
o Various plug-ins and bug fixes
Modified: branches/rel-1/freevo/setup.py
==============================================================================
--- branches/rel-1/freevo/setup.py (original)
+++ branches/rel-1/freevo/setup.py Sun Oct 22 03:43:31 2006
@@ -119,7 +119,7 @@
for f in ('COPYING', 'ChangeLog', 'INSTALL', 'README'):
data_files.append(('share/doc/freevo-%s' % version.__version__, ['%s' % f
]))
data_files.append(('share/doc/freevo-%s' % version.__version__,
['Docs/CREDITS' ]))
-data_files.append(('share/fxd', ['share/fxd/webradio.fxd']))
+#data_files.append(('share/fxd', ['share/fxd/webradio.fxd']))
# copy freevo_config.py to share/freevo. It's the best place to put it
# for now, but the location should be changed
Modified: branches/rel-1/freevo/src/audio/plugins/detach.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/detach.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/detach.py Sun Oct 22 03:43:31 2006
@@ -45,7 +45,8 @@
"""
def __init__(self):
plugin.MainMenuPlugin.__init__(self)
- config.EVENTS['audio']['EXIT'] = Event(FUNCTION_CALL, arg=self.detach)
+ config.EVENTS['audio']['DISPLAY'] = Event(FUNCTION_CALL,
arg=self.detach)
+ #config.EVENTS['audio']['EXIT'] = Event(FUNCTION_CALL, arg=self.detach)
self.show_item = menu.MenuItem(_('Show player'), action=self.show)
self.show_item.type = 'detached_player'
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
