hamster-applet r662 - in trunk: . hamster

[tbaugis svn gnome org]

Author: tbaugis
Date: Wed Dec 17 10:53:32 2008
New Revision: 662
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=662&view=rev

Log:
fix to detect pygtk in alternative directories (Frederic Peters). 
Fixes bug 564741.

Modified:
   trunk/configure.ac
   trunk/hamster/applet.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Dec 17 10:53:32 2008
@@ -73,6 +73,10 @@
 AC_MSG_CHECKING([for gnomeapplet module])
 if AC_RUN_LOG([DISPLAY= $PYTHON -c '
 try:
+    import pygtk
+    pygtk.require("2.0")
+    import gtk
+    gtk.gdk.threads_init()
     import gnomeapplet
 except ImportError, e:
     if str(e).find("gnomeapplet") >= 0:

Modified: trunk/hamster/applet.py
==============================================================================
--- trunk/hamster/applet.py	(original)
+++ trunk/hamster/applet.py	Wed Dec 17 10:53:32 2008
@@ -22,7 +22,13 @@
 
 import datetime
 import os.path
-import gnomeapplet, gtk
+
+import pygtk
+pygtk.require("2.0")
+import gtk
+gtk.gdk.threads_init()
+
+import gnomeapplet
 import gobject
 import dbus
 import dbus.service