Changeset 10009

Timestamp:

07/23/08 18:27:06 (5 weeks ago)

Author:

js

Message:

Be compatible with pygtk 2.10.

I'm still for kicking compatibility for everything < 2.12.0 as with
2.12.0, there are a few new APIs that obsolete old, stupid APIs.

Location:

trunk/src

Files:

• chat_control.py (modified) (6 diffs)
• dialogs.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -55 +55 @@
 except:
         HAS_GTK_SPELL = False
+
+HAVE_MARKUP_TOOLTIPS = gtk.pygtk_version >= (2, 12, 0)
 
 # the next script, executed in the "po" directory,
@@ -1090 +1092 @@
                 self._tune_image = self.xml.get_widget('tune_image')
 
+                if not HAVE_MARKUP_TOOLTIPS:
+                        self._mood_tooltip = gtk.Tooltips()
+                        self._activity_tooltip = gtk.Tooltips()
+                        self._tune_tooltip = gtk.Tooltips()
+
                 self.update_mood()
                 self.update_tune()
@@ -1198 +1205 @@
         def update_mood(self):
                 if self.contact.mood.has_key('mood'):
-                        mood = gobject.markup_escape_text(
-                                self.contact.mood['mood'])
+                        mood = self.contact.mood['mood']
+                        if HAVE_MARKUP_TOOLTIPS:
+                                mood = gobject.markup_escape_text(mood)
                 else:
                         mood = None
 
                 if self.contact.mood.has_key('text'):
-                        text = gobject.markup_escape_text(
-                                self.contact.mood['text'])
+                        text = self.contact.mood['text']
+                        if HAVE_MARKUP_TOOLTIPS:
+                                text = gobject.markup_escape_text(text)
                 else:
                         text = ''
@@ -1221 +1230 @@
                                         'unknown').get_pixbuf())
 
-                        self._mood_image.set_tooltip_markup('<b>%s</b>%s%s' %
-                                (mood, '\n' if text is not '' else '', text))
+                        if HAVE_MARKUP_TOOLTIPS:
+                                self._mood_image.set_tooltip_markup(
+                                        '<b>%s</b>%s%s' % (mood,
+                                        '\n' if text is not '' else '', text))
+                        else:
+                                self._mood_tooltip.set_tip(
+                                        self._mood_image, '%s%s%s' % (mood,
+                                        '\n' if text is not '' else '', text))
                         self._mood_image.show()
                 else:
@@ -1233 +1248 @@
 
                 if self.contact.tune.has_key('artist'):
-                        artist = gobject.markup_escape_text(
-                                self.contact.tune['artist'].strip())
+                        artist = self.contact.tune['artist'].strip()
+                        if HAVE_MARKUP_TOOLTIPS:
+                                artist = gobject.markup_escape_text(artist)
                 if self.contact.tune.has_key('title'):
-                        title = gobject.markup_escape_text(
-                                self.contact.tune['title'].strip())
+                        title = self.contact.tune['title'].strip()
+                        if HAVE_MARKUP_TOOLTIPS:
+                                title = gobject.markup_escape_text(title)
                 if self.contact.tune.has_key('source'):
-                        title = gobject.markup_escape_text(
-                                self.contact.tune['source'].strip())
+                        source = self.contact.tune['source'].strip()
+                        if HAVE_MARKUP_TOOLTIPS:
+                                source = gobject.markup_escape_text(source)
 
                 if artist or title:
@@ -1247 +1265 @@
                         source = source if source else _('Unknown Source')
 
-                        self._tune_image.set_tooltip_markup(_(
-                                '<b>"%(title)s"</b> by <i>%(artist)s</i>\n' +
-                                'from <i>%(source)s</i>') % {'title': title,
-                                'artist': artist, 'source': source})
+                        if HAVE_MARKUP_TOOLTIPS:
+                                self._tune_image.set_tooltip_markup(
+                                        _('<b>"%(title)s"</b> by ' +
+                                        '<i>%(artist)s</i>\n' +
+                                        'from <i>%(source)s</i>') % 
+                                        {'title': title, 'artist': artist,
+                                        'source': source})
+                        else:
+                                self._tune_tooltip.set_tip(self._tune_image,
+                                        _('%(title)s by %(artist)s\n' +
+                                        'from %(source)s') % {'title': title,
+                                        'artist': artist, 'source': source})
                         self._tune_image.show()
                 else:

trunk/src/dialogs.py

@@ -473 +473 @@
                                 gtkgui_helpers.load_mood_icon(mood))
                         self.mood_buttons[mood].set_relief(gtk.RELIEF_NONE)
-                        self.mood_buttons[mood].set_tooltip_text(
+                        gtk.Tooltips().set_tip(self.mood_buttons[mood],
                                 _(mood.replace('_', ' ')))
                         self.mood_buttons[mood].connect('clicked',