[Lsb-messages] /var/www/bzr/lsb/4.1/desktop-test r475: Backport fixes from devel (bugs 3408, 3565, 3777).

[Jeff Licquia]

------------------------------------------------------------
revno: 475
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: desktop-test
timestamp: Fri 2013-05-31 12:17:12 -0400
message:
  Backport fixes from devel (bugs 3408, 3565, 3777).
modified:
  lsb-gtkvts/src/tests/functions/Gdk/GdkColormaps.inp
  lsb-gtkvts/src/tests/functions/Keyboard_Accelerator_Groups/Keyboard_Accelerator_Groups.inp
  lsb-gtkvts/src/tests/functions/Widgets/GtkTextTag.inp
  scripts/package/Makefile
-------------- next part --------------
=== modified file 'lsb-gtkvts/src/tests/functions/Gdk/GdkColormaps.inp'
--- a/lsb-gtkvts/src/tests/functions/Gdk/GdkColormaps.inp	2005-10-12 12:48:20 +0000
+++ b/lsb-gtkvts/src/tests/functions/Gdk/GdkColormaps.inp	2013-05-31 16:17:12 +0000
@@ -748,21 +748,21 @@
 </CODE>
 
 &gen_purpose(
-             "red"
-             65535
-             0
-             0
-            );
-
-&gen_purpose(
-             "green"
-             0
-             65535
-             0
-            );
-
-&gen_purpose(
-             "blue"
+             "#FFFF00000000"
+             65535
+             0
+             0
+            );
+
+&gen_purpose(
+             "#0000FFFF0000"
+             0
+             65535
+             0
+            );
+
+&gen_purpose(
+             "#00000000FFFF"
              0
              0
              65535

=== modified file 'lsb-gtkvts/src/tests/functions/Keyboard_Accelerator_Groups/Keyboard_Accelerator_Groups.inp'
--- a/lsb-gtkvts/src/tests/functions/Keyboard_Accelerator_Groups/Keyboard_Accelerator_Groups.inp	2005-11-25 10:45:26 +0000
+++ b/lsb-gtkvts/src/tests/functions/Keyboard_Accelerator_Groups/Keyboard_Accelerator_Groups.inp	2013-05-31 16:17:12 +0000
@@ -772,24 +772,6 @@
 
 
 &gen_purpose (
-             GDK_q
-             GDK_CONTROL_MASK
-             "<Control>q"
-             );
-
-&gen_purpose (
-             GDK_a 
-             GDK_CONTROL_MASK 
-             "<Control>a"
-             );
-
-&gen_purpose (
-             GDK_F11 
-             GDK_SHIFT_MASK | GDK_CONTROL_MASK
-             "<Shift><Control>F11"
-             );
-
-&gen_purpose (
              GDK_a 
              GDK_SHIFT_MASK | GDK_MOD1_MASK
              "<Shift><Alt>a"

=== modified file 'lsb-gtkvts/src/tests/functions/Widgets/GtkTextTag.inp'
--- a/lsb-gtkvts/src/tests/functions/Widgets/GtkTextTag.inp	2011-05-03 21:33:02 +0000
+++ b/lsb-gtkvts/src/tests/functions/Widgets/GtkTextTag.inp	2013-05-31 16:17:12 +0000
@@ -23,9 +23,7 @@
 gchararray name;
 /*  GdkColor background_gdk; */
 gboolean background_full_height;
-GdkPixmap background_stipple;
 /*  GdkColor foreground_gdk; */
-GdkPixmap foreground_stipple;
 GtkTextDirection direction;
 gboolean editable;
 gchararray font;
@@ -121,22 +119,6 @@
                background_full_height, FALSE);
 }
 
-g_object_get (tag, "background-stipple", &background_stipple, NULL);
-if (background_stipple.parent_instance.ref_count != 0) 
-{
-    TEST_FAIL ("background_stipple.parent_instance.ref_count = %d, should be %d", 
-               background_stipple.parent_instance.ref_count, 0);
-}
-
-g_object_get (tag, "foreground-stipple", 
-               &foreground_stipple, NULL);
-if (foreground_stipple.parent_instance.ref_count != 0) 
-/*  if (foreground_stipple.user_data != NULL)  */
-{
-    TEST_FAIL ("foreground_stipple.parent_instance.ref_count = %d, should be %d", 
-               foreground_stipple.parent_instance.ref_count, NULL);
-}
-
 g_object_get (tag, "direction", &direction, NULL);
 if (direction != GTK_TEXT_DIR_NONE) 
 {

=== modified file 'scripts/package/Makefile'
--- a/scripts/package/Makefile	2013-01-29 16:27:30 +0000
+++ b/scripts/package/Makefile	2013-05-31 16:17:12 +0000
@@ -2,7 +2,7 @@
 # XXX a specfile from a .spec.in with this info, but not yet: 
 # XXX for now keep this in sync with the specfile
 PACKAGE=lsb-test-desktop
-VERSION=4.1.8
+VERSION=4.1.9
 RELEASE=1
 
 # for pkgck