rpms/xorg-x11-utils/F-9 xdpyinfo-1.0.2-silence-misc-errors.patch, 1.1, 1.2

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-utils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12922

Modified Files:
	xdpyinfo-1.0.2-silence-misc-errors.patch 
Log Message:
patch novice

xdpyinfo-1.0.2-silence-misc-errors.patch:

Index: xdpyinfo-1.0.2-silence-misc-errors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/F-9/xdpyinfo-1.0.2-silence-misc-errors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdpyinfo-1.0.2-silence-misc-errors.patch	25 Apr 2008 17:41:06 -0000	1.1
+++ xdpyinfo-1.0.2-silence-misc-errors.patch	29 Apr 2008 14:34:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up xdpyinfo-1.0.2/xdpyinfo.c.jx xdpyinfo-1.0.2/xdpyinfo.c
---- xdpyinfo-1.0.2/xdpyinfo.c.jx	2008-04-25 13:28:35.000000000 -0400
-+++ xdpyinfo-1.0.2/xdpyinfo.c	2008-04-25 13:36:28.000000000 -0400
+diff -up xdpyinfo-1.0.2/xdpyinfo.c.misc xdpyinfo-1.0.2/xdpyinfo.c
+--- xdpyinfo-1.0.2/xdpyinfo.c.misc	2007-03-20 16:53:54.000000000 -0400
++++ xdpyinfo-1.0.2/xdpyinfo.c	2008-04-29 10:34:22.000000000 -0400
 @@ -135,6 +135,14 @@ in this Software without prior written a
  char *ProgramName;
  Bool queryExtensions = False;
@@ -33,29 +33,21 @@
      return 1;
  }
  #endif
-@@ -846,24 +858,17 @@ char *flgtable[] = { "None", "ClearDTR",
- 		     "ClearDTR and ClearRTS" };
- 
- static int
--misc_error(Display *dpy, XErrorEvent *ev)
--{
--    return 0;
--}
--
--static int
- print_XF86Misc_info(Display *dpy, char *extname)
- {
-     int majorrev, minorrev, ret = 1;
-     XF86MiscMouseSettings mouseinfo;
-     XF86MiscKbdSettings kbdinfo;
--    int (*old_handler)(Display *, XErrorEvent *);
- 
-     if (!XF86MiscQueryVersion(dpy, &majorrev, &minorrev))
+@@ -856,6 +868,8 @@ print_XF86Misc_info(Display *dpy, char *
  	return 0;
      print_standard_extension_info(dpy, extname, majorrev, minorrev);
  
--    old_handler = XSetErrorHandler(misc_error);
 +    old_handler = XSetErrorHandler(silent_errors);
++
+     if ((majorrev > 0) || (majorrev == 0 && minorrev > 0)) {
+       if (!XF86MiscGetKbdSettings(dpy, &kbdinfo))
+ 	return 0;
+@@ -887,6 +901,8 @@ print_XF86Misc_info(Display *dpy, char *
+       printf("                        Buttons: %d\n", mouseinfo.buttons);
+     }
  
-     if ((majorrev > 0) || (majorrev == 0 && minorrev > 0)) do {
-       if (!XF86MiscGetKbdSettings(dpy, &kbdinfo)) {
++    XSetErrorHandler(old_handler);
++
+     return 1;
+ }
+ #endif