← Back to branch summary

~jtaylor/ubuntu/oneiric/gajim/multiple-CVE

« back to all changes in this revision

Viewing changes to src/groupchat_control.py

  • Committer: Bazaar Package Importer
  • Author(s): Nafallo Bjälevik
  • Date: 2008-12-17 12:08:19 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20081217120819-20o3ibfc8fc1r1vk
Tags: 0.12-0ubuntu1
* New upstream release:
  + Fix text rendering in notifications
  + Better sessions support
  + Better auto-away support
  + Fix banshee support
  + Quodlibet support
  + Fix GSSAPI authentification
  + Those translations have been temporarily removed because they are outdated:
    Breton (br), Greek (el), Dutch (nl), Portugese (pt). 
* debian/control:
  - Added python-kerberos (>= 1.1) to Recommends for the GSSAPI auth.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/groupchat_control.py
122
122
                room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account)
123
123
                if room_jid in gajim.interface.minimized_controls[account]:
124
124
                        room_ctrl = gajim.interface.minimized_controls[account][room_jid]
125
 
                self.room_name = room_ctrl.name
 
125
                if room_ctrl:
 
126
                        self.room_name = room_ctrl.name
 
127
                else:
 
128
                        self.room_name = room_jid
126
129
                self.gc_contact = gc_contact
127
130
                ChatControl.__init__(self, parent_win, contact, account, session)
128
131
                self.TYPE_ID = 'pm'
2234
2237
 
2235
2238
        def on_list_treeview_button_press_event(self, widget, event):
2236
2239
                '''popup user's group's or agent menu'''
 
2240
                # hide tooltip, no matter the button is pressed
 
2241
                self.tooltip.hide_tooltip()
2237
2242
                if event.button == 3: # right click
2238
2243
                        try:
2239
2244
                                path, column, x, y = widget.get_path_at_pos(int(event.x),