fix a Traceback, a typo in string, and adhere to coding style

This commit is contained in:
Nikos Kouremenos 2005-07-07 23:37:04 +00:00
parent 4240fd7ecc
commit b75562490b
2 changed files with 9 additions and 9 deletions

View File

@ -494,7 +494,7 @@ class RosterTooltip(gtk.Window):
gtk.Window.__init__(self, gtk.WINDOW_POPUP) gtk.Window.__init__(self, gtk.WINDOW_POPUP)
self.plugin = plugin self.plugin = plugin
self.set_resizable(False) self.set_resizable(False)
self.set_name('gtk-tooltips') self.set_name('roster-tooltips')
hbox = gtk.HBox() hbox = gtk.HBox()
hbox.set_spacing(6) hbox.set_spacing(6)
hbox.set_border_width(6) hbox.set_border_width(6)
@ -510,8 +510,8 @@ class RosterTooltip(gtk.Window):
self.account.set_alignment(0, 0) self.account.set_alignment(0, 0)
self.account.set_selectable(False) self.account.set_selectable(False)
contents.pack_start(self.account) contents.pack_start(self.account)
self.timeout=0 self.timeout = 0
self.prefered_position = [0,0] self.prefered_position = [0, 0]
self.path = None self.path = None
self.set_events(gtk.gdk.POINTER_MOTION_MASK) self.set_events(gtk.gdk.POINTER_MOTION_MASK)
self.connect_after('expose_event', self.expose) self.connect_after('expose_event', self.expose)
@ -573,7 +573,7 @@ class RosterTooltip(gtk.Window):
info = '<span size="large" weight="bold">' + contact.jid + '</span>' info = '<span size="large" weight="bold">' + contact.jid + '</span>'
info += '\n<span weight="bold">' + _('Name: ') + '</span>' + \ info += '\n<span weight="bold">' + _('Name: ') + '</span>' + \
contact.name contact.name
info += '\n<span weight="bold">' + _('Subscribtion: ') + '</span>' + \ info += '\n<span weight="bold">' + _('Subscription: ') + '</span>' + \
contact.sub contact.sub
if contact.keyID: if contact.keyID:
keyID = None keyID = None
@ -904,7 +904,7 @@ class PopupNotificationWindow:
self.plugin.roster.contacts[self.account][self.jid] = [user] self.plugin.roster.contacts[self.account][self.jid] = [user]
self.plugin.roster.add_contact_to_roster(user.self.jid, self.account) self.plugin.roster.add_contact_to_roster(user.self.jid, self.account)
if msg_type == 'normal': # it's single message if self.msg_type == 'normal': # it's single message
pass pass
else: # 'chat' else: # 'chat'
self.plugin.roster.new_chat(user, self.account) self.plugin.roster.new_chat(user, self.account)

View File

@ -546,16 +546,16 @@ class RosterWindow:
self.tooltip.show_tooltip(contact, img, self.window.get_pointer(), self.tooltip.show_tooltip(contact, img, self.window.get_pointer(),
self.window.get_position()) self.window.get_position())
def on_roster_treeview_leave_notify_event(self, widget, ev): def on_roster_treeview_leave_notify_event(self, widget, event):
model = widget.get_model() model = widget.get_model()
props = widget.get_path_at_pos(int(ev.x), int(ev.y)) props = widget.get_path_at_pos(int(event.x), int(event.y))
if self.tooltip.timeout > 0: if self.tooltip.timeout > 0:
if not props or self.tooltip.path == props[0]: if not props or self.tooltip.path == props[0]:
self.tooltip.hide_tooltip() self.tooltip.hide_tooltip()
def on_roster_treeview_motion_notify_event(self, widget, ev): def on_roster_treeview_motion_notify_event(self, widget, event):
model = widget.get_model() model = widget.get_model()
props = widget.get_path_at_pos(int(ev.x), int(ev.y)) props = widget.get_path_at_pos(int(event.x), int(event.y))
if self.tooltip.timeout > 0: if self.tooltip.timeout > 0:
if not props or self.tooltip.path != props[0]: if not props or self.tooltip.path != props[0]:
self.tooltip.hide_tooltip() self.tooltip.hide_tooltip()