Author: dmeyer
Date: Mon Jan 7 15:59:37 2008
New Revision: 2947
Log:
keep names in sync with pynotifier
Modified:
trunk/base/src/notifier/nf_wrapper.py
trunk/base/src/notifier/pynotifier/__init__.py
Modified: trunk/base/src/notifier/nf_wrapper.py
==============================================================================
--- trunk/base/src/notifier/nf_wrapper.py (original)
+++ trunk/base/src/notifier/nf_wrapper.py Mon Jan 7 15:59:37 2008
@@ -177,7 +177,10 @@
if not module in ('generic', 'gtk', 'twisted_experimental'):
raise AttributeError('unsupported notifier %s' % module)
-
+
+ if module == 'twisted_experimental':
+ module = 'twisted'
+
# use the selected module
notifier.init(getattr(notifier, module.upper()), **options)
Modified: trunk/base/src/notifier/pynotifier/__init__.py
==============================================================================
--- trunk/base/src/notifier/pynotifier/__init__.py (original)
+++ trunk/base/src/notifier/pynotifier/__init__.py Mon Jan 7 15:59:37 2008
@@ -43,7 +43,7 @@
step = None
# notifier types
-( GENERIC, QT, GTK, WX, TWISTED_EXPERIMENTAL ) = range( 5 )
+( GENERIC, QT, GTK, WX, TWISTED ) = range( 5 )
# socket conditions
IO_READ = None
@@ -69,7 +69,7 @@
elif model == WX:
import nf_wx as nf_impl
log.warn( 'the WX notifier is deprecated and is no longer
maintained' )
- elif model == TWISTED_EXPERIMENTAL:
+ elif model == TWISTED:
import nf_twisted as nf_impl
log.info("using nf_twisted")
else:
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
