autocommit 2022-01-02 16:30:30 CET

src/ifs/xdg_wm_base/mod.rs

@@ -1,9 +1,9 @@
 mod types;
 
+use crate::client::{AddObj, Client, ClientError};
 use crate::globals::{Global, GlobalName};
-use crate::objects::{Interface, Object, ObjectError, ObjectId};
+use crate::object::{Interface, Object, ObjectId};
 use crate::utils::buffd::WlParser;
-use crate::wl_client::WlClientData;
 use std::rc::Rc;
 pub use types::*;
 
@@ -25,7 +25,7 @@ impl XdgWmBaseGlobal {
     async fn bind_(
         self: Rc<Self>,
         id: ObjectId,
-        client: &WlClientData,
+        client: &Client,
         version: u32,
     ) -> Result<(), XdgWmBaseError> {
         let obj = Rc::new(XdgWmBaseObj {
@@ -33,7 +33,7 @@ impl XdgWmBaseGlobal {
             id,
             version,
         });
-        client.attach_client_object(obj)?;
+        client.add_client_obj(&obj)?;
         Ok(())
     }
 }
@@ -43,7 +43,7 @@ impl XdgWmBaseObj {
         &self,
         request: u32,
         parser: WlParser<'_, '_>,
-    ) -> Result<(), ObjectError> {
+    ) -> Result<(), ClientError> {
         unreachable!();
     }
 }