Docky

1	=== modified file 'scripts/emesene_control.py' (properties changed: -x to +x)
2	--- scripts/emesene_control.py 2010-03-11 09:33:42 +0000
3	+++ scripts/emesene_control.py 2010-03-12 11:50:32 +0000
4	@@ -1,7 +1,7 @@
5	#!/usr/bin/env python
6
7	#
8	-# Copyright (C) 2010 Tom Blacknight, Rico Tzschichholz
9	+# Copyright (C) 2010 Tom Cowell, Rico Tzschichholz
10	#
11	# This program is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU General Public License as published by
13	@@ -67,8 +67,11 @@
14	self.update_badge()
15
16	def init_emesene_objects(self):
17	- obj = self.bus.get_object(emesenebus, emesenepath)
18	- self.emesene = dbus.Interface(obj, emeseneiface)
19	+ try:
20	+ obj = self.bus.get_object(emesenebus, emesenepath)
21	+ self.emesene = dbus.Interface(obj, emeseneiface)
22	+ except:
23	+ print 'Could not find emesene D-Bus.'
24
25	def conversation_updated(self, count):
26	self.update_badge()

Merge lp:~tom-blacknight/docky/emesene into lp:docky