backend-rdp: use compositor wide struct xkb_context

Instead of allocating our own copy of struct xkb_context use the
compositor wide instance. This avoids leaking of a struct
xkb_context per connection as well.

Signed-off-by: Stefan Agner <stefan@agner.ch>

diff --git a/libweston/backend-rdp/rdp.c b/libweston/backend-rdp/rdp.c
index e2f59dc518b166d75c017eefaf0d16bd48ef27c4..6aec15d2f946fcb90f5c76845da2c8f35e7ed3ec 100644 (file)
--- a/libweston/backend-rdp/rdp.c
+++ b/libweston/backend-rdp/rdp.c
@@ -963,7 +963,6 @@ xf_peer_activate(freerdp_peer* client)
        rdpSettings *settings;
        rdpPointerUpdate *pointer;
        struct rdp_peers_item *peersItem;
-       struct xkb_context *xkbContext;
        struct xkb_rule_names xkbRuleNames;
        struct xkb_keymap *keymap;
        struct weston_output *weston_output;
@@ -1047,13 +1046,8 @@ xf_peer_activate(freerdp_peer* client)
 
        keymap = NULL;
        if (xkbRuleNames.layout) {
-               xkbContext = xkb_context_new(0);
-               if (!xkbContext) {
-                       weston_log("unable to create a xkb_context\n");
-                       return FALSE;
-               }
-
-               keymap = xkb_keymap_new_from_names(xkbContext, &xkbRuleNames, 0);
+               keymap = xkb_keymap_new_from_names(b->compositor->xkb_context,
+                                                  &xkbRuleNames, 0);
        }
 
        if (settings->ClientHostname)