From 7d046a1f5bcc3a55f250aed0cbfaf8a54a8d6875 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Tue, 1 Mar 2016 18:11:55 +0100
Subject: Pack magic externs into a xcb_stuff.

---
 source/xrmoptions.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source/xrmoptions.c')

diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 6960c738..9d304a7e 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -36,6 +36,7 @@
 #include <xkbcommon/xkbcommon-compose.h>
 #include <xkbcommon/xkbcommon-x11.h>
 #include <X11/Xresource.h>
+#include "xcb.h"
 #include "x11-helper.h"
 #include "rofi.h"
 #include "xrmoptions.h"
@@ -223,9 +224,9 @@ static void __config_parse_xresource_options ( XrmDatabase xDB )
         g_free ( name );
     }
 }
-void config_parse_xresource_options ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen )
+void config_parse_xresource_options ( xcb_stuff *xcb )
 {
-    char *name = window_get_text_prop ( xcb_connection, xcb_screen->root, XCB_ATOM_RESOURCE_MANAGER );
+    char *name = window_get_text_prop ( xcb_stuff_get_root_window ( xcb ), XCB_ATOM_RESOURCE_MANAGER );
     if ( name ) {
         // Map Xresource entries to rofi config options.
         XrmDatabase xDB = XrmGetStringDatabase ( name );
@@ -329,9 +330,9 @@ static void __config_parse_xresource_options_dynamic ( XrmDatabase xDB )
     }
 }
 
-void config_parse_xresource_options_dynamic ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen )
+void config_parse_xresource_options_dynamic ( xcb_stuff *xcb )
 {
-    char        *name = window_get_text_prop ( xcb_connection, xcb_screen->root, XCB_ATOM_RESOURCE_MANAGER );
+    char        *name = window_get_text_prop ( xcb_stuff_get_root_window ( xcb ), XCB_ATOM_RESOURCE_MANAGER );
     XrmDatabase xDB   = XrmGetStringDatabase ( name );
     __config_parse_xresource_options_dynamic ( xDB );
     XrmDestroyDatabase ( xDB );
-- 
cgit v1.2.3