[kupfer: 7/22] plugin.pidgin: Modify PidginContact description
- From: Ulrik Sverdrup <usverdrup src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [kupfer: 7/22] plugin.pidgin: Modify PidginContact description
- Date: Fri, 30 Oct 2009 14:02:45 +0000 (UTC)
commit 19e64397e977819effde12af93bae4b769d8c2b8
Author: Chmouel Boudjnah <chmouel boudjnah rackspace co uk>
Date: Tue Oct 27 22:15:49 2009 +0000
plugin.pidgin: Modify PidginContact description
Make the description brief but specific, include contact's address,
network and status.
Show if the user is away in the contact's description as well.
kupfer/plugin/pidgin.py | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/kupfer/plugin/pidgin.py b/kupfer/plugin/pidgin.py
index 0625c99..43c7958 100644
--- a/kupfer/plugin/pidgin.py
+++ b/kupfer/plugin/pidgin.py
@@ -87,25 +87,19 @@ class SendMessage (Action):
class PidginContact(Leaf):
""" Leaf represent single contact from Pidgin """
- def __init__(self, jid, name, account, icon, protocol, availability,
+ def __init__(self, jid, name, account, icon, protocol, available,
status_message):
obj = (account, jid)
Leaf.__init__(self, obj, name or jid)
- if name:
- self._description = "%s <%s>" % (name, jid)
- else:
- self._description = name
-
- if availability == 0:
- self._description += " - N/A"
-
- self._description += " - %s" % protocol
- if status_message:
- self._description += "\n%s" % status_message
+ self.info = {
+ "userid": jid,
+ "available": u"" if available else u", %s" % _("Away"),
+ "protocol": protocol,
+ "status": status_message,
+ }
self.account = account
- self.name = name
self.jid = jid
self.icon = icon
@@ -114,7 +108,10 @@ class PidginContact(Leaf):
yield SendMessage()
def get_description(self):
- return self._description
+ desc = _("%(userid)s on %(protocol)s%(available)s") % self.info
+ if self.info["status"]:
+ desc += u"\n%s" % self.info["status"]
+ return desc
def get_thumbnail(self, width, height):
if not self.icon:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]