[pybliographer] Sync from the main git repo

[Zoltan Kota <zkota src gnome org>]

commit 54812b645cb3b71996a499614773b56d5b78c030
Author: Zoltan Kota <zoltank gmail com>
Date:   Tue Aug 24 00:32:32 2010 +0200

    Sync from the main git repo

 Pyblio/GnomeUI/Config.py   |    4 ++--
 Pyblio/GnomeUI/Document.py |    7 +++++--
 Pyblio/GnomeUI/Fields.py   |    4 ++--
 Pyblio/GnomeUI/Utils.py    |   16 ++++++++--------
 setup-check.py             |    4 ++--
 5 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/Pyblio/GnomeUI/Config.py b/Pyblio/GnomeUI/Config.py
index 3baf09f..2d8628c 100644
--- a/Pyblio/GnomeUI/Config.py
+++ b/Pyblio/GnomeUI/Config.py
@@ -53,8 +53,8 @@ class ConfigDialog (Utils.GladeWindow):
 
         content.pack_start (self.w)
 
-        tooltips = gtk.Tooltips ()
-        tooltips.enable ()
+##      tooltips = gtk.Tooltips ()
+##      tooltips.enable ()
         
         self.warning = 0
         self.parent = parent
diff --git a/Pyblio/GnomeUI/Document.py b/Pyblio/GnomeUI/Document.py
index 1b57434..909c5b4 100644
--- a/Pyblio/GnomeUI/Document.py
+++ b/Pyblio/GnomeUI/Document.py
@@ -234,12 +234,15 @@ class Document (Connector.Publisher):
         h.pack_start(i, False, False)
 
         # create a tooltips object
-        self.toolbartips = gtk.Tooltips()
+##      self.toolbartips = gtk.Tooltips()
 
         self.quick_search = gtk.Entry()
         self.quick_search.connect('activate', self.simple_search)
         h.pack_start(self.quick_search, False, False)
-        self.toolbartips.set_tip(self.quick_search, _('Quick search'))
+##      self.toolbartips.set_tip(self.quick_search, _('Quick search'))
+
+        if Config.get ('gnome/tooltips').data:
+            self.quick_search.set_tooltip_text (_('Quick search'))
 
         i = gtk.ToolItem()
         i.add(h)
diff --git a/Pyblio/GnomeUI/Fields.py b/Pyblio/GnomeUI/Fields.py
index 9b4a316..b8c5ec3 100644
--- a/Pyblio/GnomeUI/Fields.py
+++ b/Pyblio/GnomeUI/Fields.py
@@ -60,8 +60,8 @@ class FieldsDialog (Utils.GladeWindow):
         self.dialog = self.xml.get_widget ('fields1')
         self.w = self.xml.get_widget ('notebook')
 
-        tooltips = gtk.Tooltips ()
-        tooltips.enable ()
+##      tooltips = gtk.Tooltips ()
+##      tooltips.enable ()
         
         self.warning = 0
         self.parent = parent
diff --git a/Pyblio/GnomeUI/Utils.py b/Pyblio/GnomeUI/Utils.py
index 0460693..e293c2a 100644
--- a/Pyblio/GnomeUI/Utils.py
+++ b/Pyblio/GnomeUI/Utils.py
@@ -141,18 +141,18 @@ def set_cursor (self, name):
     return
 
 
-_tooltips = gtk.Tooltips ()
+##_tooltips = gtk.Tooltips ()
 
 
-def set_tip (w, text):
-    _tooltips.set_tip (w, text)
-    return
+##def set_tip (w, text):
+##    _tooltips.set_tip (w, text)
+##    return
 
 
-if Config.get ('gnome/tooltips').data:
-    _tooltips.enable ()
-else:
-    _tooltips.disable ()
+##if Config.get ('gnome/tooltips').data:
+##    _tooltips.enable ()
+##else:
+##    _tooltips.disable ()
 
 
 def popup_add (menu, item, action = None, argument = None):
diff --git a/setup-check.py b/setup-check.py
index f1126f2..995193b 100644
--- a/setup-check.py
+++ b/setup-check.py
@@ -87,8 +87,8 @@ except:
     error ('unexpected error')
 
 else:
-    if gtk.pygtk_version < (2,4,0):
-        error ('requested version for PyGtk is %s, but I detected %s' % ('2.4.0', v))
+    if gtk.pygtk_version < (2,12,0):
+        error ('requested version for PyGtk is %s, but I detected %s' % ('2.12.0', v))
 
 
 try: