[Hildon-test-aut-commits] r242 - in trunk/dogtail: debian dogtail

[manishan at garage.maemo.org]

Author: manishan
Date: 2007-08-16 17:40:32 +0300 (Thu, 16 Aug 2007)
New Revision: 242

Modified:
   trunk/dogtail/debian/changelog
   trunk/dogtail/dogtail/rocknrole.py
   trunk/dogtail/dogtail/utils.py
Log:
 comitting dogtail 0.6.2-1osso10

Modified: trunk/dogtail/debian/changelog
===================================================================
--- trunk/dogtail/debian/changelog	2007-08-16 11:05:41 UTC (rev 241)
+++ trunk/dogtail/debian/changelog	2007-08-16 14:40:32 UTC (rev 242)
@@ -1,3 +1,10 @@
+dogtail (0.6.2-1osso10) feisty; urgency=low
+
+  *  Changed screenshot method in dogtail/rocknrole.py to use gtk.gdk. And
+     added hail GTK_MODULES to be loaded in dogtail/utils.py
+
+ -- Shivakumar <ext-shivakumar.manishankar at nokia.com>  Thu, 16 Aug 2007 17:37:03 +0300
+
 dogtail (0.6.2-1osso9) feisty; urgency=low
 
   * Reapplied patch 430353, commented lined in dogtail/utils.py and

Modified: trunk/dogtail/dogtail/rocknrole.py
===================================================================
--- trunk/dogtail/dogtail/rocknrole.py	2007-08-16 11:05:41 UTC (rev 241)
+++ trunk/dogtail/dogtail/rocknrole.py	2007-08-16 14:40:32 UTC (rev 242)
@@ -563,12 +563,11 @@
             else :
                 screenshot=defaultName
 
-            ## When dogtail 0.6 gets integrated, most of the below code will be revisited/removed and we will use screenshot from utils as-is, or modify it a bit to
-            ## take node screenshot.
 
             if not os.path.isdir(config.scratchDir) : raise LookupError
             expected=config.scratchDir + '/' + screenshot.split('.png')[0]+'_exp.png'
 
+            '''
             answer = []
             if not node : 
                 cmd = "import -window 'root' %s 2>&1" % expected
@@ -591,7 +590,6 @@
                 pixbuf.save(expected, 'png')
             except gobject.GError :
                 raise ValueError, "Failed to save screenshot in png format"
-            '''
         
             self.assert_ (os.path.isfile(expected), "%s file does not exist" % expected)
             print "Took image " + expected
@@ -607,8 +605,6 @@
             else :
                 screenshot=defaultName
 
-            ## When dogtail 0.6 gets integrated, most of the below code will be revisited/removed and we will use screenshot from utils as-is, or modify it a bit to
-            ## take node screenshot.
             
             if not os.path.isdir(config.scratchDir) : 
                 print config.scratchDir, " config.scratchDir does not exist"
@@ -622,6 +618,7 @@
                 print expected, " does not exist"
                 raise LookupError
 
+            '''
             answer = []
             if not node : 
                 cmd = "import -window 'root' %s 2>&1" % actual
@@ -644,7 +641,6 @@
                 pixbuf.save(actual, 'png')
             except gobject.GError:
                 raise ValueError, "Failed to save screenshot in png format"
-            '''
 
             if not os.path.isfile(actual) :
                 print actual, " does not exist"

Modified: trunk/dogtail/dogtail/utils.py
===================================================================
--- trunk/dogtail/dogtail/utils.py	2007-08-16 11:05:41 UTC (rev 241)
+++ trunk/dogtail/dogtail/utils.py	2007-08-16 14:40:32 UTC (rev 242)
@@ -74,7 +74,7 @@
     if not desktop: from tree import root as desktop
     args = string.split()
     name = args[0]
-    environ['GTK_MODULES'] = 'gail:atk-bridge'
+    environ['GTK_MODULES'] = 'gail:hail:atk-bridge'
     pid = spawnvpe (P_NOWAIT, name, args, environ)
 
     if not appName: