[kupfer: 11/51] plugin.*: Adapt plugins to GroupingLeaf change
- From: Ulrik Sverdrup <usverdrup src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [kupfer: 11/51] plugin.*: Adapt plugins to GroupingLeaf change
- Date: Sun, 10 Jan 2010 11:57:45 +0000 (UTC)
commit 6ca978a44711a91208bb0d0baef1b84e2c7899b6
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date: Thu Jan 7 02:19:06 2010 +0100
plugin.*: Adapt plugins to GroupingLeaf change
kupfer/plugin/clawsmail.py | 2 +-
kupfer/plugin/gajim.py | 4 ++--
kupfer/plugin/pidgin.py | 4 ++--
kupfer/plugin/thunderbird.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/kupfer/plugin/clawsmail.py b/kupfer/plugin/clawsmail.py
index 85fd9b1..f5f7762 100644
--- a/kupfer/plugin/clawsmail.py
+++ b/kupfer/plugin/clawsmail.py
@@ -68,7 +68,7 @@ def _email_from_leaf(leaf):
if isinstance(leaf, TextLeaf):
return _check_email(leaf.object) and leaf.object
if isinstance(leaf, ContactLeaf):
- return EMAIL_KEY in leaf and list(leaf[EMAIL_KEY])[0]
+ return EMAIL_KEY in leaf and leaf[EMAIL_KEY]
class NewMailAction(Action):
''' Create new mail to selected leaf'''
diff --git a/kupfer/plugin/gajim.py b/kupfer/plugin/gajim.py
index b7a0927..4d5ef18 100644
--- a/kupfer/plugin/gajim.py
+++ b/kupfer/plugin/gajim.py
@@ -74,7 +74,7 @@ class OpenChat(Action):
def activate(self, leaf):
interface = _create_dbus_connection()
account = leaf.account
- jid = JID_KEY in leaf and list(leaf[JID_KEY])[0]
+ jid = JID_KEY in leaf and leaf[JID_KEY]
if interface is not None:
vmaj,vmin,vbuild = _check_gajim_version(interface)
if vmaj == 0 and vmin < 13:
@@ -89,7 +89,7 @@ class OpenChat(Action):
yield ContactLeaf
def valid_for_item(self, item):
- return JID_KEY in item and bool(list(item[JID_KEY])[0])
+ return JID_KEY in item and item[JID_KEY]
class ChangeStatus(Action):
diff --git a/kupfer/plugin/pidgin.py b/kupfer/plugin/pidgin.py
index d33f351..7ea4194 100644
--- a/kupfer/plugin/pidgin.py
+++ b/kupfer/plugin/pidgin.py
@@ -62,8 +62,8 @@ def _send_message_to_contact(pcontact, message, present=False):
interface = _create_dbus_connection()
if not interface:
return
- account = pcontact[PIDGIN_ACCOUNT][0]
- jid = pcontact[PIDGIN_JID][0]
+ account = pcontact[PIDGIN_ACCOUNT]
+ jid = pcontact[PIDGIN_JID]
conversation = interface.PurpleConversationNew(1, account, jid)
im = interface.PurpleConvIm(conversation)
interface.PurpleConvImSend(im, message)
diff --git a/kupfer/plugin/thunderbird.py b/kupfer/plugin/thunderbird.py
index 6e2ef0f..69d9290 100644
--- a/kupfer/plugin/thunderbird.py
+++ b/kupfer/plugin/thunderbird.py
@@ -56,7 +56,7 @@ class NewMailAction(Action):
def activate(self, leaf):
if isinstance(leaf, ContactLeaf):
- email = leaf.object[EMAIL_KEY]
+ email = leaf[EMAIL_KEY]
elif isinstance(leaf, UrlLeaf):
email = _get_email_from_url(email)
else:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]