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

[ukblacknight]

Emesene helper

[ukblacknight (tom-blacknight)]

I just need the contents of /scripts merging - the emesene helper and it's associated metadata file. Apologies if all of this is totally wrong, but I'm still learning bzr/source control!

[ukblacknight (tom-blacknight)]

I forgot to mention - this will only work on emesene svn version 2267 or greater, as it has important changes to the D-Bus plugin.

I think a 1.6.1 release is expected at least before the launch of Ubuntu 10.04.

[lp:~tom-blacknight/docky/emesene]

1166. By Rico Tzschichholz on 2010-03-07

Rework of autostart checking and setting (also fixes bug 529320)

1167. By Rico Tzschichholz on 2010-03-07

properly disable plugin when it gets dragged of a dock

1168. By Rico Tzschichholz on 2010-03-07

Handle InvalidOperationException thrown by AddinManger.Initalize

1169. By Rico Tzschichholz on 2010-03-07

fix version output on console

1170. By Rico Tzschichholz on 2010-03-07

add very simple Desktop docklet, could be extended with more functions in the future

1171. By Rico Tzschichholz on 2010-03-07

translations: update Chinese (Simplified), Galician, Hungarian, Russian - add Hindi

1172. By Robert Dyer on 2010-03-07

try to fix bug 533872 - fullscreen apps on multiple monitors - based on patch from Florian Scandella

1173. By Rico Tzschichholz on 2010-03-08

update translation template

1174. By Rico Tzschichholz on 2010-03-08

add new translators and fix translation template

[Rico Tzschichholz (ricotz)]

review: Needs Fixing

Unmerged revisions

1180. By ukblacknight on 2010-03-12

Changed my name on the copyright.

1179. By ukblacknight on 2010-03-12

Helper should now start.

1178. By ukblacknight on 2010-03-12

Resolved conflicts

1177. By ukblacknight on 2010-03-12

Cleaned up emesene_control.py

1176. By ukblacknight on 2010-03-08

helper files added.

=== added directory 'scripts'
=== renamed directory 'scripts' => 'scripts.moved'
=== added file 'scripts/emesene_control.py'
--- scripts/emesene_control.py	1970-01-01 00:00:00 +0000
+++ scripts/emesene_control.py	2010-03-02 20:38:14 +0000
@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+
+#  
+#  Copyright (C) 2009-2010 Jason Smith, Rico Tzschichholz
+# 
+#  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 3 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, see <http://www.gnu.org/licenses/>.
+#
+
+import atexit
+import gobject
+import glib
+import dbus
+import dbus.glib
+import sys
+import os
+
+try:
+	from docky.docky import DockyItem, DockySink
+	from signal import signal, SIGTERM
+	from sys import exit
+except ImportError, e:
+	print e
+	exit()
+
+emesenebus = "org.emesene.dbus"
+emesenepath = "/org/emesene/dbus"
+emeseneiface = "org.emesene.dbus"
+
+class DockyEmeseneItem(DockyItem):
+	def __init__(self, path):
+		DockyItem.__init__(self, path)
+		self.msg_count = 0
+		self.emesene = None
+
+		self.bus.add_signal_receiver(self.name_owner_changed_cb, dbus_interface='org.freedesktop.DBus', signal_name = 'NameOwnerChanged')
+		obj = self.bus.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus")
+		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
+
+		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
+
+		self.bus.add_signal_receiver(self.conversation_updated, "unread_messages", emeseneiface, emesenebus, emesenepath)
+	
+	def list_names_handler(self, names):
+		if emesenebus in names:
+			self.init_emesene_objects()
+			self.update_badge()
+
+	def list_names_error_handler(self, error):
+		print "error getting bus names - %s" % str(error)
+
+	def name_owner_changed_cb(self, name, old_owner, new_owner):
+		if name == emesenebus:
+			if new_owner:
+				self.init_emesene_objects()
+			else:
+				self.emesene = None
+				self.msg_count = 0
+				self.update_badge()
+
+	def init_emesene_objects(self):
+		try:
+			obj = self.bus.get_object(emesenebus, emesenepath)
+			self.emesene = dbus.Interface(obj, emeseneiface)
+		except:
+			print 'Emesene dbus could not be found.'
+
+	def conversation_updated(self,count):
+		self.update_badge()
+
+	def update_badge(self):
+		if not self.emesene:
+			self.iface.ResetBadgeText()
+			return False
+
+		print 'update the badge'
+		
+		count = self.emesene.get_message_count()
+		if count > 0:
+			self.iface.SetBadgeText("%s" % count)
+		else:
+			self.iface.ResetBadgeText()
+
+		return True		
+
+class DockyEmeseneSink(DockySink):
+	def item_path_found(self, pathtoitem, item):
+		if item.GetOwnsDesktopFile() and item.GetDesktopFile().endswith ("emesene.desktop"):
+			self.items[pathtoitem] = DockyEmeseneItem(pathtoitem)
+
+
+emesenesink = DockyEmeseneSink()
+
+def cleanup():
+	dockysink.dispose()
+
+if __name__ == "__main__":
+	mainloop = gobject.MainLoop(is_running=True)
+
+	atexit.register (cleanup)
+	signal(SIGTERM, lambda signum, strack_frame: exit(1))
+	print 'Starting emesene handler...'
+
+	mainloop.run()

=== added directory 'scripts/metadata'
=== added file 'scripts/metadata/emesene_control.py.info'
--- scripts/metadata/emesene_control.py.info	1970-01-01 00:00:00 +0000
+++ scripts/metadata/emesene_control.py.info	2010-03-02 20:38:14 +0000
@@ -0,0 +1,3 @@
+NAME="Emesene Controls"
+DESCRIPTION="See your message count status on Emesene"
+ICON="emesene"