← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/dialogs.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/dialogs.py
442
442
                                self.subactivity,
443
443
                                self.entry.get_text().decode('utf-8'))
444
444
                else:
445
 
                        pep.user_retract_activity(self.account)
 
445
                        pep.user_send_activity(self.account, '')
446
446
                self.window.destroy()
447
447
 
448
448
        def on_cancel_button_clicked(self, widget):
529
529
                '''Return mood and messsage (None if no mood selected)'''
530
530
                message = self.entry.get_text().decode('utf-8')
531
531
                if self.mood is None:
532
 
                        pep.user_retract_mood(self.account)
 
532
                        pep.user_send_mood(self.account, '')
533
533
                else:
534
534
                        pep.user_send_mood(self.account, self.mood, message)
535
535
                self.window.destroy()
2038
2038
                if not text:
2039
2039
                        text = gajim.get_name_from_jid(account, jid) # default value of text
2040
2040
                if not title:
2041
 
                        title = event_type
 
2041
                        title = ''
2042
2042
 
2043
2043
                event_type_label.set_markup(
2044
 
                        '<span foreground="black" weight="bold">%s</span>' % title)
 
2044
                        '<span foreground="black" weight="bold">%s</span>' %
 
2045
                        gobject.markup_escape_text(title))
2045
2046
 
2046
2047
                # set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ]
2047
2048
                self.window.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('black'))
2075
2076
                popup_bg_color = gtk.gdk.color_parse(bg_color)
2076
2077
                close_button.modify_bg(gtk.STATE_NORMAL, popup_bg_color)
2077
2078
                eventbox.modify_bg(gtk.STATE_NORMAL, popup_bg_color)
2078
 
                event_description_label.set_markup(
2079
 
                        '<span foreground="black">%s</span>' % text)
 
2079
                event_description_label.set_markup('<span foreground="black">%s</span>' %
 
2080
                        gobject.markup_escape_text(text))
2080
2081
 
2081
2082
                # set the image
2082
2083
                image.set_from_file(path_to_image)