Application: Move api_registry field to Runtime

epilys · epilys · commit cda46619167b · 2023-03-20T22:29:57.000+02:00
diff --git a/src/app.rs b/src/app.rs
@@ -118,8 +118,6 @@ pub struct ApplicationInner {
     pub runtime: Runtime,
     pub undo_db: RefCell<undo::UndoDatabase>,
     pub env_args: OnceCell<Vec<String>>,
-    #[cfg(feature = "python")]
-    pub api_registry: RefCell<crate::api::ObjectRegistry>,
 }
 
 #[glib::object_subclass]
@@ -505,13 +503,13 @@ impl ApplicationInner {
 
     #[cfg(feature = "python")]
     pub fn register_obj(&self, obj: &glib::Object) -> Uuid {
-        let mut registry = self.api_registry.borrow_mut();
+        let mut registry = self.runtime.api_registry.borrow_mut();
         registry.add(obj)
     }
 
     #[cfg(feature = "python")]
     pub fn get_obj(&self, id: Uuid) -> Option<glib::Object> {
-        let registry = self.api_registry.borrow();
+        let registry = self.runtime.api_registry.borrow();
         registry.get(id)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,6 @@ pub struct ApplicationInner {`
`118`	`118`	`pub runtime: Runtime,`
`119`	`119`	`pub undo_db: RefCell<undo::UndoDatabase>,`
`120`	`120`	`pub env_args: OnceCell<Vec<String>>,`
`121`		`- #[cfg(feature = "python")]`
`122`		`- pub api_registry: RefCell<crate::api::ObjectRegistry>,`
`123`	`121`	`}`
`124`	`122`
`125`	`123`	`#[glib::object_subclass]`
`@@ -505,13 +503,13 @@ impl ApplicationInner {`
`505`	`503`
`506`	`504`	`#[cfg(feature = "python")]`
`507`	`505`	`pub fn register_obj(&self, obj: &glib::Object) -> Uuid {`
`508`		`- let mut registry = self.api_registry.borrow_mut();`
	`506`	`+ let mut registry = self.runtime.api_registry.borrow_mut();`
`509`	`507`	`registry.add(obj)`
`510`	`508`	`}`
`511`	`509`
`512`	`510`	`#[cfg(feature = "python")]`
`513`	`511`	`pub fn get_obj(&self, id: Uuid) -> Option<glib::Object> {`
`514`		`- let registry = self.api_registry.borrow();`
	`512`	`+ let registry = self.runtime.api_registry.borrow();`
`515`	`513`	`registry.get(id)`
`516`	`514`	`}`
`517`	`515`	`}`