[Xcb-commit] 2 commits - event image

[Jamey Sharp]

 event/xcb_event.h |   45 ---------------------------------------------
 image/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 46 deletions(-)

New commits:
commit 4d6556ec16409ee42478acefc316442722060272
Author: Jamey Sharp <jamey at minilop.net>
Date:   Thu Jun 24 11:06:48 2010 -0700

    Delete redundant core-protocol error codes.
    
    XCB already defines the error codes, though with unfortunate names. The
    following sed replacements should correct any code that was using these
    definitions:
    
        s/\<XCB_EVENT_ERROR_SUCCESS\>/0/g
        s/\<XCB_EVENT_ERROR_BAD_COLOR\>/XCB_COLORMAP/g
        s/\<XCB_EVENT_ERROR_BAD_GC\>/XCB_G_CONTEXT/g
        s/\<XCB_EVENT_ERROR_BAD_/XCB_/g
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

diff --git a/event/xcb_event.h b/event/xcb_event.h
index aac51d1..8978cca 100644
--- a/event/xcb_event.h
+++ b/event/xcb_event.h
@@ -168,51 +168,6 @@ XCB_EVENT_MAKE_EVENT_HANDLER(colormap_notify, COLORMAP_NOTIFY)
 XCB_EVENT_MAKE_EVENT_HANDLER(client_message, CLIENT_MESSAGE)
 XCB_EVENT_MAKE_EVENT_HANDLER(mapping_notify, MAPPING_NOTIFY)
 
-/** Everything is ok */
-#define XCB_EVENT_ERROR_SUCCESS 0
-/** Bad request code */
-#define XCB_EVENT_ERROR_BAD_REQUEST 1
-/** Int parameter out of range */
-#define XCB_EVENT_ERROR_BAD_VALUE 2
-/** Parameter not a Window */
-#define XCB_EVENT_ERROR_BAD_WINDOW 3
-/** Parameter not a Pixmap */
-#define XCB_EVENT_ERROR_BAD_PIXMAP 4
-/** Parameter not an Atom */
-#define XCB_EVENT_ERROR_BAD_ATOM 5
-/** Parameter not a Cursor */
-#define XCB_EVENT_ERROR_BAD_CURSOR 6
-/** Parameter not a Font */
-#define XCB_EVENT_ERROR_BAD_FONT 7
-/** Parameter mismatch */
-#define XCB_EVENT_ERROR_BAD_MATCH 8
-/** Parameter not a Pixmap or Window */
-#define XCB_EVENT_ERROR_BAD_DRAWABLE 9
-/* Depending on context:
-   - key/button already grabbed
-   - attempt to free an illegal
-     cmap entry
-   - attempt to store into a read-only
-     color map entry.
-   - attempt to modify the access control
-     list from other than the local host.
-*/
-#define XCB_EVENT_ERROR_BAD_ACCESS 10
-/** Insufficient resources */
-#define XCB_EVENT_ERROR_BAD_ALLOC 11
-/** No such colormap */
-#define XCB_EVENT_ERROR_BAD_COLOR 12
-/** Parameter not a GC */
-#define XCB_EVENT_ERROR_BAD_GC 13
-/** Choice not in range or already used */
-#define XCB_EVENT_ERROR_BAD_ID_CHOICE 14
-/** Font or color name doesn't exist */
-#define XCB_EVENT_ERROR_BAD_NAME 15
-/** Request length incorrect */
-#define XCB_EVENT_ERROR_BAD_LENGTH 16
-/** Server is defective */
-#define XCB_EVENT_ERROR_BAD_IMPLEMENTATION 17
-
 /**
  * @brief Convert an event response type to a label.
  * @param type The event type.
commit 40d0e7302d846c3e6061c95afa0677f14c38c4b0
Author: Jamey Sharp <jamey at minilop.net>
Date:   Thu Jun 24 11:02:13 2010 -0700

    Ensure that xcb-image sample apps get built.
    
    Otherwise nobody will notice if they bitrot.
    
    Signed-off-by: Jamey Sharp <jamey at minilop.net>

diff --git a/image/Makefile.am b/image/Makefile.am
index a18b228..db255df 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -16,7 +16,7 @@ pkgconfig_DATA = xcb-image.pc
 
 EXTRA_DIST=xcb-image.pc.in
 
-EXTRA_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_bitmap
+noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_bitmap
 
 check_PROGRAMS = test_swap