Merge branch 'master' of git@gitorious.org:meegotouch/meegotouch-compositor0.7.0rc1

21 files changed, 127 insertions, 0 deletions

diff --git a/tests/functional/test0.py b/tests/functional/test0.py
index 1a8ab46..f47c2bc 100755
--- a/tests/functional/test0.py
+++ b/tests/functional/test0.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -51,4 +54,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test1.py b/tests/functional/test1.py
index dd29cbc..81f5f4d 100755
--- a/tests/functional/test1.py
+++ b/tests/functional/test1.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -47,4 +50,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test10.py b/tests/functional/test10.py
index 173ff74..031f453 100755
--- a/tests/functional/test10.py
+++ b/tests/functional/test10.py
@@ -17,6 +17,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -94,4 +97,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test11.py b/tests/functional/test11.py
index 3a6b497..7833d92 100755
--- a/tests/functional/test11.py
+++ b/tests/functional/test11.py
@@ -16,6 +16,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -71,4 +74,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test12.py b/tests/functional/test12.py
index fdbda93..1cc2bb1 100755
--- a/tests/functional/test12.py
+++ b/tests/functional/test12.py
@@ -18,6 +18,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -106,4 +109,8 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
+
 sys.exit(ret)
diff --git a/tests/functional/test13.py b/tests/functional/test13.py
index b5a912b..47748ff 100755
--- a/tests/functional/test13.py
+++ b/tests/functional/test13.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -53,4 +56,7 @@ if size[0] != fs_w or size[1] != fs_h:
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test14.py b/tests/functional/test14.py
index 7aa80df..6d0f218 100755
--- a/tests/functional/test14.py
+++ b/tests/functional/test14.py
@@ -14,6 +14,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -54,4 +57,7 @@ if size[0] == fs_w and size[1] == fs_h:
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test15.py b/tests/functional/test15.py
index 24ae99d..ca56dfe 100755
--- a/tests/functional/test15.py
+++ b/tests/functional/test15.py
@@ -20,6 +20,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -74,4 +77,7 @@ check_visi(win4, ' UNOBS. ')
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test16.py b/tests/functional/test16.py
index 09299fb..619c3f0 100755
--- a/tests/functional/test16.py
+++ b/tests/functional/test16.py
@@ -12,6 +12,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -51,4 +54,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test17.py b/tests/functional/test17.py
index 28e8689..f685efe 100755
--- a/tests/functional/test17.py
+++ b/tests/functional/test17.py
@@ -41,6 +41,9 @@ def check_focus(w):
 if os.system('/sbin/mcetool --unblank-screen --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -94,4 +97,7 @@ os.popen('pkill windowctl')
 time.sleep(1)
 check_focus(home_win)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test18.py b/tests/functional/test18.py
index 4ed3d0f..2035f7e 100755
--- a/tests/functional/test18.py
+++ b/tests/functional/test18.py
@@ -21,6 +21,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -103,4 +106,7 @@ check_window_order()
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test19.py b/tests/functional/test19.py
index 95caca5..2967b79 100755
--- a/tests/functional/test19.py
+++ b/tests/functional/test19.py
@@ -17,6 +17,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -84,4 +87,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test2.py b/tests/functional/test2.py
index d8811df..bb4204a 100755
--- a/tests/functional/test2.py
+++ b/tests/functional/test2.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -41,4 +44,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test20.py b/tests/functional/test20.py
index 395eafa..9ef059b 100755
--- a/tests/functional/test20.py
+++ b/tests/functional/test20.py
@@ -17,6 +17,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -81,4 +84,7 @@ os.popen('pkill windowctl')
 os.popen('pkill context-provide')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test3.py b/tests/functional/test3.py
index ac71764..db9de57 100755
--- a/tests/functional/test3.py
+++ b/tests/functional/test3.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -70,4 +73,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test4.py b/tests/functional/test4.py
index e96f7f9..a1ce0ec 100755
--- a/tests/functional/test4.py
+++ b/tests/functional/test4.py
@@ -13,6 +13,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -41,4 +44,7 @@ if found != 2:
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test5.py b/tests/functional/test5.py
index 1b27b61..fb630f0 100755
--- a/tests/functional/test5.py
+++ b/tests/functional/test5.py
@@ -14,6 +14,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -51,4 +54,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test6.py b/tests/functional/test6.py
index 8ba4b9c..a061f74 100755
--- a/tests/functional/test6.py
+++ b/tests/functional/test6.py
@@ -15,6 +15,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -80,4 +83,7 @@ for arg in ['l', 'b', 'r', 't']:
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test7.py b/tests/functional/test7.py
index 32c708d..952288a 100755
--- a/tests/functional/test7.py
+++ b/tests/functional/test7.py
@@ -17,6 +17,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -62,4 +65,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test8.py b/tests/functional/test8.py
index 09400fe..2631663 100755
--- a/tests/functional/test8.py
+++ b/tests/functional/test8.py
@@ -19,6 +19,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -105,4 +108,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)
diff --git a/tests/functional/test9.py b/tests/functional/test9.py
index 9da2158..fe471bc 100755
--- a/tests/functional/test9.py
+++ b/tests/functional/test9.py
@@ -16,6 +16,9 @@ import os, re, sys, time
 if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
   print 'mcetool is missing!'
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled false'):
+  print 'cannot disable notifications'
+
 if os.system('pidof mcompositor'):
   print 'mcompositor is not running'
   sys.exit(1)
@@ -81,4 +84,7 @@ for l in s.splitlines():
 os.popen('pkill windowctl')
 time.sleep(1)
 
+if os.system('/usr/bin/gconftool-2 --type bool --set /desktop/meego/notifications/previews_enabled true'):
+  print 'cannot re-enable notifications'
+
 sys.exit(ret)