Merge lp:~unity-team/libunity/fix-latest-glib-unity7 into lp:~unity-team/libunity/libunity-7.0

[Didier Roche-Tolomelli]

Fix tests failing due to latest glib

Fix tests failing due to latest glib (see https://git.gnome.org/browse/glib/commit/?id=f641699299ed2713cf247e3465bb1a21612b36f7)

[Michal Hruby (mhr3)]

Let's see if this works now...

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'test/data/applications/asdasdasd.desktop'
--- test/data/applications/asdasdasd.desktop	2011-12-05 12:18:16 +0000
+++ test/data/applications/asdasdasd.desktop	2013-03-25 11:33:20 +0000
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=libunity bogus app
 Comment=For testing non-exisiting apps
-Exec=xterm
+Exec=/bin/true
 Icon=distributor-logo
 Terminal=false
 Type=Application

=== modified file 'test/data/applications/rhythmbox.desktop'
--- test/data/applications/rhythmbox.desktop	2011-11-25 10:56:19 +0000
+++ test/data/applications/rhythmbox.desktop	2013-03-25 11:33:20 +0000
@@ -3,7 +3,7 @@
 GenericName=Music Player
 X-GNOME-FullName=Rhythmbox Music Player
 Comment=Play and organize your music collection
-Exec=rhythmbox %U
+Exec=/bin/true
 Terminal=false
 Type=Application
 Icon=rhythmbox

=== modified file 'test/data/applications/testapp1.desktop'
--- test/data/applications/testapp1.desktop	2011-12-05 13:36:37 +0000
+++ test/data/applications/testapp1.desktop	2013-03-25 11:33:20 +0000
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=libunity test app 1
 Comment=Test App 1 for testing non-exisiting apps
-Exec=xterm
+Exec=/bin/true
 Icon=distributor-logo
 Terminal=false
 Type=Application

=== modified file 'test/data/applications/ubuntu-about.desktop'
--- test/data/applications/ubuntu-about.desktop	2012-02-27 09:05:54 +0000
+++ test/data/applications/ubuntu-about.desktop	2013-03-25 11:33:20 +0000
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=About Ubuntu
 Comment=Learn more about Ubuntu
-Exec=yelp ghelp:about-ubuntu
+Exec=/bin/true
 Icon=distributor-logo
 Terminal=false
 Type=Application

=== modified file 'test/data/test_desktop_file.desktop'
--- test/data/test_desktop_file.desktop	2011-09-27 09:48:39 +0000
+++ test/data/test_desktop_file.desktop	2013-03-25 11:33:20 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Test Application
 Comment=This is a test application desktop file
-Exec=xclock
+Exec=/bin/true
 Terminal=false
 Type=Application
 StartupNotify=false

=== modified file 'test/vala/test-io.vala'
--- test/vala/test-io.vala	2013-02-28 23:14:50 +0000
+++ test/vala/test-io.vala	2013-03-25 11:33:20 +0000
@@ -27,7 +27,7 @@
     static string TEST_DATA = """[Desktop Entry]
 Name=Test Application
 Comment=This is a test application desktop file
-Exec=xclock
+Exec=/bin/true
 Terminal=false
 Type=Application
 StartupNotify=false
@@ -87,7 +87,7 @@
                                       Priority.LOW, null,
                                       out data, out data_size);
           
-          /* The test file is 177 bytes long */
+          /* Test file bytes size */
           if (data_size != TEST_DATA.length)
             {
               critical (@"Expected file size $(TEST_DATA.length), but found $data_size");