bigboard r7254 - in trunk/bigboard: . stocks/people
- From: otaylor svn gnome org
- To: svn-commits-list gnome org
- Subject: bigboard r7254 - in trunk/bigboard: . stocks/people
- Date: Wed, 6 Feb 2008 14:55:42 +0000 (GMT)
Author: otaylor
Date: Wed Feb 6 14:55:42 2008
New Revision: 7254
URL: http://svn.gnome.org/viewvc/bigboard?rev=7254&view=rev
Log:
- Show all emails/aims/xmpps in the profile slideout
- Fix bug with notification on addition of contact emails
Modified:
trunk/bigboard/people_tracker.py
trunk/bigboard/stocks/people/PeopleStock.py
trunk/bigboard/stocks/people/peoplewidgets.py
Modified: trunk/bigboard/people_tracker.py
==============================================================================
--- trunk/bigboard/people_tracker.py (original)
+++ trunk/bigboard/people_tracker.py Wed Feb 6 14:55:42 2008
@@ -84,7 +84,7 @@
self.contact.connect(self.__contact_name_changed, "name")
self.contact.connect(self.__contact_status_changed, "status")
self.contact.connect(self.__contact_aims_changed, "aims")
- self.contact.connect(self.__contact_emails_changed, "aims")
+ self.contact.connect(self.__contact_emails_changed, "emails")
self.contact.connect(self.__contact_xmpps_changed, "xmpps")
self.contact.connect(self.__contact_aim_buddies_changed, "aimBuddies")
self.contact.connect(self.__contact_xmpp_buddies_changed, "xmppBuddies")
Modified: trunk/bigboard/stocks/people/PeopleStock.py
==============================================================================
--- trunk/bigboard/stocks/people/PeopleStock.py (original)
+++ trunk/bigboard/stocks/people/PeopleStock.py Wed Feb 6 14:55:42 2008
@@ -194,26 +194,11 @@
if query in p.display_name:
matched = True
- if p.contact and not matched:
- emails = []
- try:
- for email in getattr(p.contact.emails):
- if query in email.lower():
- matched = True
- break
- except AttributeError:
- pass
+ for email in p.emails:
+ if query in email.lower():
+ matched = True
+ break
- if p.user and not matched:
- emails = []
- try:
- for email in getattr(p.user.emails):
- if query in email.lower():
- matched = True
- break
- except AttributeError:
- pass
-
if not matched:
if query in p.aims:
matched = True
Modified: trunk/bigboard/stocks/people/peoplewidgets.py
==============================================================================
--- trunk/bigboard/stocks/people/peoplewidgets.py (original)
+++ trunk/bigboard/stocks/people/peoplewidgets.py Wed Feb 6 14:55:42 2008
@@ -774,19 +774,19 @@
self.__remove_link.set_property('text',
"Remove %s from network" % self.person.display_name)
- if len(person.emails) > 0:
- email = linkklass(text=person.emails[0], xalign=hippo.ALIGNMENT_START)
- email.connect('activated', self.__on_activate_email)
+ for addr in person.emails:
+ email = linkklass(text=addr, xalign=hippo.ALIGNMENT_START)
+ email.connect('activated', self.__on_activate_email, addr)
self.__address_box.append(email)
- if len(person.aims) > 0:
- aim = linkklass(text=person.aims[0], xalign=hippo.ALIGNMENT_START)
- aim.connect('activated', self.__on_activate_aim)
+ for addr in person.aims:
+ aim = linkklass(text=addr, xalign=hippo.ALIGNMENT_START)
+ aim.connect('activated', self.__on_activate_aim, addr)
self.__address_box.append(aim)
- if len(person.xmpps) > 0:
- xmpp = linkklass(text=person.xmpps[0], xalign=hippo.ALIGNMENT_START)
- xmpp.connect('activated', self.__on_activate_xmpp)
+ for addr in person.xmpps:
+ xmpp = linkklass(text=addr, xalign=hippo.ALIGNMENT_START)
+ xmpp.connect('activated', self.__on_activate_xmpp, addr)
self.__address_box.append(xmpp)
add = linkklass(text='add address', xalign=hippo.ALIGNMENT_END, font_scale=0.8)
@@ -797,18 +797,18 @@
self.emit("close", True)
libbig.show_url(self.person.user.homeUrl)
- def __on_activate_email(self, canvas_item):
+ def __on_activate_email(self, canvas_item, addr):
self.emit("close", True)
# email should probably cgi.escape except it breaks if you escape the @
- os.spawnlp(os.P_NOWAIT, 'gnome-open', 'gnome-open', 'mailto:' + self.person.emails[0])
+ os.spawnlp(os.P_NOWAIT, 'gnome-open', 'gnome-open', 'mailto:' + addr)
- def __on_activate_aim(self, canvas_item):
+ def __on_activate_aim(self, canvas_item, addr):
self.emit("close", True)
- _open_aim(self.person.aims[0])
+ _open_aim(addr)
- def __on_activate_xmpp(self, canvas_item):
+ def __on_activate_xmpp(self, canvas_item, addr):
self.emit("close", True)
- _open_xmpp(self.person.xmpps[0])
+ _open_xmpp(addr)
def __on_activate_add_address(self, canvas_item):
dialog = gtk.Dialog(title=("Add an address for %s" % self.person.display_name))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]