ooo-build r11767 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Sun Mar  2 03:36:49 2008
New Revision: 11767
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11767&view=rev

Log:
2008-03-01  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/autocorrect-accidental-caps-lock-vcl.diff: fixed 
	another silly mistake: XTestFakeKeyEvent() returns non-zero on success, 
	not 'Success' which have a value of zero.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff

Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff	(original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff	Sun Mar  2 03:36:49 2008
@@ -228,31 +228,6 @@
      // set new parent window
      virtual void                SetParent( SalFrame* pNewParent );
      // reparent window to act as a plugin; implementation
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/inc/postx.h vcl/unx/inc/postx.h
---- vcl.clean/unx/inc/postx.h	2006-06-19 15:46:31.000000000 -0400
-+++ vcl/unx/inc/postx.h	2008-02-28 12:46:34.000000000 -0500
-@@ -58,7 +58,6 @@
- #undef Min
- #undef Max
- #undef DestroyAll
--#undef Success
- 
- #undef Printer
- /* #undef FontInfo */
-@@ -80,5 +79,13 @@ Error KeyPress must be Equal 2
- #endif
- #define XLIB_KeyPress 2
- 
-+#ifdef Success
-+#if Success != 0
-+Error Success must be equal to 0
-+#endif
-+#undef Success
-+#endif
-+#define XLIB_Success 0
-+
- #endif
- 
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/inc/prex.h vcl/unx/inc/prex.h
 --- vcl.clean/unx/inc/prex.h	2007-04-26 06:40:23.000000000 -0400
 +++ vcl/unx/inc/prex.h	2008-02-29 09:50:58.000000000 -0500
@@ -295,7 +270,7 @@
      virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx
 --- vcl.clean/unx/source/app/saldisp.cxx	2008-01-29 11:22:34.000000000 -0500
-+++ vcl/unx/source/app/saldisp.cxx	2008-03-01 21:10:56.000000000 -0500
++++ vcl/unx/source/app/saldisp.cxx	2008-03-01 22:26:55.000000000 -0500
 @@ -86,6 +86,10 @@ Status XineramaGetInfo(Display*, int, XR
  #endif
  #endif
@@ -318,7 +293,7 @@
 +    if (nKeyCode == KEY_CAPSLOCK)
 +    {
 +        XLIB_KeyCode keyCaps = XKeysymToKeycode(GetDisplay(), XK_Caps_Lock);
-+        if (XTestFakeKeyEvent(GetDisplay(), keyCaps, true, CurrentTime) == XLIB_Success)
++        if (XTestFakeKeyEvent(GetDisplay(), keyCaps, true, CurrentTime))
 +            XTestFakeKeyEvent(GetDisplay(), keyCaps, false, CurrentTime);
 +    }
 +#endif