Post-rebase fixes

Author: prokopyl

src/x11/visual_info.rs

@@ -66,8 +66,8 @@ impl WindowVisualConfig {
 pub fn create_color_map(
     connection: &XcbConnection, visual_id: Visualid,
 ) -> Result<Colormap, Box<dyn Error>> {
-    let colormap = connection.conn2.generate_id()?;
-    connection.conn2.create_colormap(
+    let colormap = connection.conn.generate_id()?;
+    connection.conn.create_colormap(
         ColormapAlloc::NONE,
         colormap,
         connection.screen().root,

src/x11/xcb_connection.rs

@@ -116,6 +116,6 @@ impl XcbConnection {
     }
 
     pub fn screen(&self) -> &Screen {
-        &self.conn2.setup().roots[self.screen]
+        &self.conn.setup().roots[self.screen]
     }
 }