TMP 2

Do not commit
bilelmoussaoui · Jun 5, 2022 · dfd187b · dfd187b
1 parent 03888c4
commit dfd187b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ashpd-demo/src/portals/desktop/open_uri.rs b/ashpd-demo/src/portals/desktop/open_uri.rs
@@ -70,7 +70,7 @@ impl OpenUriPage {
         let identifier = WindowIdentifier::from_native(&root).await;
         let uri = imp.uri_entry.text();
         let activation_token = if imp.activation_token_switch.is_active() {
-            ashpd::ActivationToken::from_native(&root)
+            Some(ashpd::ActivationToken::from_native(&root).unwrap())
         } else {
             None
         };

diff --git a/src/activation_token/gtk4.rs b/src/activation_token/gtk4.rs
@@ -34,7 +34,7 @@ impl Gtk4ActivationToken {
                 };
                 let wl_surface = WlSurface::from_id(&cnx, surface_id).unwrap();
 
-                let wl = WaylandActivationToken::from_surface(&wl_surface).ok()?;
+                let wl = WaylandActivationToken::from_surface(&wl_surface).unwrap();
 
                 Some(Self::from(wl))
             }

diff --git a/src/activation_token/wayland.rs b/src/activation_token/wayland.rs
@@ -21,13 +21,13 @@ impl Drop for WaylandActivationToken {
 
 impl WaylandActivationToken {
     pub fn from_surface(surface: &WlSurface) -> Result<Self, Box<dyn std::error::Error>> {
-        let cnx = wayland_client::Connection::connect_to_env()?;
-        let wl_activation = XdgActivationV1::from_id(&cnx, surface.id())?;
+        let cnx = wayland_client::Connection::connect_to_env().unwrap();
+        let wl_activation = XdgActivationV1::from_id(&cnx, surface.id()).unwrap();
         let mut queue = cnx.new_event_queue();
         let queue_handle = queue.handle();
-        let inner = wl_activation.get_activation_token(&queue_handle, ())?;
+        let inner = wl_activation.get_activation_token(&queue_handle, ()).unwrap();
         let mut exported_token = ExportedActivationToken::default();
-        queue.blocking_dispatch(&mut exported_token)?;
+        queue.blocking_dispatch(&mut exported_token).unwrap();
 
         Ok(Self {
             token: exported_token.0,