← Back to branch summary

~ubuntu-branches/ubuntu/wily/libx11/wily-proposed

« back to all changes in this revision

Viewing changes to src/ClDisplay.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-02-24 12:02:14 UTC
  • mfrom: (1.1.12 upstream) (2.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110224120214-a86d0lv48wk8itl6
Tags: 2:1.4.1-5ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add Latin locale.
  - Add Klingon locale.
  - Add 102_double_arrows_Compose.patch: compose keys for double arrows
    (LP: 680143)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ClDisplay.c
30
30
#ifdef HAVE_CONFIG_H
31
31
#include <config.h>
32
32
#endif
33
 
#if USE_XCB
34
33
#include "Xxcbint.h"
35
 
#else /* !USE_XCB */
36
 
#include <X11/Xtrans/Xtrans.h>
37
 
#endif /* USE_XCB */
38
34
#include "Xlib.h"
39
35
#include "Xlibint.h"
40
36
#include "Xintconn.h"
72
68
            if (dpy->request != dpy->last_request_read)
73
69
                XSync(dpy, 1);
74
70
        }
75
 
#if USE_XCB
76
71
        xcb_disconnect(dpy->xcb->connection);
77
 
#else /* !USE_XCB */
78
 
        _XDisconnectDisplay(dpy->trans_conn);
79
 
#endif /* USE_XCB */
80
72
        _XFreeDisplayStructure (dpy);
81
73
        return 0;
82
74
}