Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2762
Modified Files:
eventhandler.py plugin.py
Removed Files:
cleanup.py
Log Message:
use notifier shutdown function
--- cleanup.py DELETED ---
Index: eventhandler.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/eventhandler.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** eventhandler.py 25 Jun 2005 08:52:24 -0000 1.24
--- eventhandler.py 4 Jul 2005 15:18:51 -0000 1.25
***************
*** 62,70 ****
# python imports
import time
import logging
# notifier
! import notifier
# freevo imports
--- 62,71 ----
# python imports
+ import sys
import time
import logging
# notifier
! import kaa.notifier
# freevo imports
***************
*** 181,185 ****
self.__idle_time = 0
# callback to inherit idle time every minute
! notifier.addTimer(60000, self.__update_idle_time)
--- 182,186 ----
self.__idle_time = 0
# callback to inherit idle time every minute
! kaa.notifier.addTimer(60000, self.__update_idle_time)
***************
*** 431,435 ****
# it is not possible to import it earlier.
import config
- import cleanup
from gui.windows import ConfirmBox
--- 432,435 ----
***************
*** 443,447 ****
'Freevo.\n\nLogfile: %s') % \
(event, sysconfig.syslogfile)
! pop = ConfirmBox(msg, handler=cleanup.shutdown,
handler_message = _('shutting down...'),
button0_text = _('Shutdown'),
--- 443,448 ----
'Freevo.\n\nLogfile: %s') % \
(event, sysconfig.syslogfile)
! handler = kaa.notifier.Callback(sys.exit, 0)
! pop = ConfirmBox(msg, handler=handler,
handler_message = _('shutting down...'),
button0_text = _('Shutdown'),
Index: plugin.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugin.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** plugin.py 25 Jun 2005 08:52:24 -0000 1.89
--- plugin.py 4 Jul 2005 15:18:52 -0000 1.90
***************
*** 39,46 ****
import logging
! import notifier
# freevo imports
- import cleanup
from event import Event
import eventhandler
--- 39,45 ----
import logging
! import kaa.notifier
# freevo imports
from event import Event
import eventhandler
***************
*** 325,330 ****
current = 0
for name, type, level, args, number in _all_plugins:
! if notifier.step:
! notifier.step(False, False)
current += 1
if callback:
--- 324,329 ----
current = 0
for name, type, level, args, number in _all_plugins:
! if kaa.notifier.step:
! kaa.notifier.step(False, False)
current += 1
if callback:
***************
*** 560,564 ****
if p.__class__.poll != DaemonPlugin.poll:
# plugin has a self defined poll function, register it
! notifier.addTimer( p.poll_interval, p._poll )
if p.__class__.eventhandler != DaemonPlugin.eventhandler:
--- 559,563 ----
if p.__class__.poll != DaemonPlugin.poll:
# plugin has a self defined poll function, register it
! kaa.notifier.addTimer( p.poll_interval, p._poll )
if p.__class__.eventhandler != DaemonPlugin.eventhandler:
***************
*** 589,593 ****
if p.__class__.shutdown != Plugin.shutdown:
# plugin has a self defined shutdown function
! cleanup.register( p.shutdown )
if p.plugin_name:
--- 588,592 ----
if p.__class__.shutdown != Plugin.shutdown:
# plugin has a self defined shutdown function
! kaa.notifier.addShutdown( p.shutdown )
if p.plugin_name:
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
