Check wnck python module existence

nagappan · Mar 13, 2012 · ab02bc0 · ab02bc0
1 parent 36a9ee0
commit ab02bc0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/ldtpd/core.py b/ldtpd/core.py
@@ -20,18 +20,24 @@
 Headers in this file shall remain intact.
 """
 
+wnckModule = False
 from pyatspi import findDescendant, Registry
 import locale
 import subprocess
 try:
   # If we have gtk3+ gobject introspection, use that
   from gi.repository import Wnck as wnck
   from gi.repository import Gtk as gtk
-  gtk3 = True
+  wnckModule = gtk3 = True
 except:
   # No gobject introspection, use gtk2 libwnck
   import gtk
-  import wnck
+  try:
+    import wnck
+    wnckModule = True
+  except:
+    # Not all environments support wnck package
+    pass
   gtk3 = False
 from utils import Utils, ProcessStats
 from constants import abbreviated_roles
@@ -533,6 +539,8 @@ def maximizewindow(self, window_name = None):
         @return: 1 if window maximized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = MaximizeWindow(window_name)
 
         return int(waiter.run())
@@ -548,6 +556,8 @@ def minimizewindow(self, window_name = None):
         @return: 1 if window minimized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = MinimizeWindow(window_name)
 
         return int(waiter.run())
@@ -563,6 +573,8 @@ def unmaximizewindow(self, window_name = None):
         @return: 1 if window unmaximized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = UnmaximizeWindow(window_name)
 
         return int(waiter.run())
@@ -578,6 +590,8 @@ def unminimizewindow(self, window_name = None):
         @return: 1 if window unminimized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = UnminimizeWindow(window_name)
 
         return int(waiter.run())
@@ -593,6 +607,8 @@ def activatewindow(self, window_name):
         @return: 1 if window unminimized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = ActivateWindow(window_name)
 
         return int(waiter.run())
@@ -608,6 +624,8 @@ def closewindow(self, window_name = None):
         @return: 1 if window unminimized, 0 if not.
         @rtype: integer
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         waiter = CloseWindow(window_name)
 
         return int(waiter.run())
@@ -1300,6 +1318,8 @@ def getobjectnameatcoords(self, wait_time = 0.0):
                 matching name and type as list of string [objectname]
         @rtype: (string, list)
         """
+        if not wnckModule:
+          raise LdtpServerException('Install python wnck module')
         self.wait(wait_time)
         # Following lines from Accerciser, _inspectUnderMouse method
         # quick_select.py file

diff --git a/ldtpd/waiters.py b/ldtpd/waiters.py
@@ -19,6 +19,7 @@
 Headers in this file shall remain intact.
 """
 
+wnckModule = False
 from utils import Utils
 import re
 import time
@@ -27,13 +28,18 @@
   from gi.repository import Wnck as wnck
   from gi.repository import Gtk as gtk
   from gi.repository import GObject as gobject
-  gtk3 = True
+  wnckModule = gtk3 = True
 except:
   # No gobject introspection, use gtk2 libwnck
+  gtk3 = False
   import gtk
-  import wnck
   import gobject
-  gtk3 = False
+  try:
+    import wnck
+    wnckModule = True
+  except:
+    # Not all environments support wnck package
+    pass
 import fnmatch
 import pyatspi
 import traceback