Merge branch 'dev-timer-applet'

Closes #45
https://github.com/mate-desktop/mate-applets/issues/45

1 files changed, 0 insertions, 49 deletions

diff --git a/timer-applet/src/timerapplet/controllers/TimerService.py b/timer-applet/src/timerapplet/controllers/TimerService.py
deleted file mode 100644
index a4b25b8a..00000000
--- a/timer-applet/src/timerapplet/controllers/TimerService.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (C) 2008 Jimmy Do <[email protected]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import dbus
-import dbus.service
-from timerapplet import core
-from timerapplet import utils
-
-DBUS_INTERFACE_NAMESPACE = 'net.launchpad.timerapplet.TimerApplet.Timer'
-
-class TimerService(dbus.service.Object):
-    def __init__(self, bus_name, object_path, timer):
-        dbus.service.Object.__init__(self,
-                                     dbus.service.BusName(bus_name, bus=dbus.SessionBus()),
-                                     object_path)
-        self._timer = timer
-    
-    @dbus.service.method(dbus_interface=DBUS_INTERFACE_NAMESPACE, in_signature='siii')
-    def Start(self, name, hours, minutes, seconds):
-        if self._timer.get_state() != core.Timer.STATE_IDLE:
-            self._timer.reset()
-        self._timer.set_duration(utils.hms_to_seconds(hours, minutes, seconds))
-        self._timer.set_name(name)
-        self._timer.start()
-        
-    @dbus.service.method(dbus_interface=DBUS_INTERFACE_NAMESPACE)
-    def Stop(self):
-        if self._timer.get_state() != core.Timer.STATE_IDLE:
-            self._timer.reset()
-    
-    @dbus.service.method(dbus_interface=DBUS_INTERFACE_NAMESPACE)
-    def PauseContinue(self):
-        if self._timer.get_state() == core.Timer.STATE_RUNNING:
-            self._timer.stop()
-        elif self._timer.get_state() == core.Timer.STATE_PAUSED:
-            self._timer.start()