[fractal/fractal-next] window: Rename append_error to add_toast



commit ec94bfb555025a9536c03ba3a34f0b1406a72daf
Author: Kévin Commaille <zecakeh tedomum fr>
Date:   Wed Feb 16 13:29:26 2022 +0100

    window: Rename append_error to add_toast

 src/login.rs                                             |  6 +++---
 src/session/content/verification/session_verification.rs |  2 +-
 src/session/mod.rs                                       |  2 +-
 src/session/room/event_actions.rs                        |  4 ++--
 src/session/room/mod.rs                                  | 10 +++++-----
 src/session/room_list.rs                                 |  2 +-
 src/session/verification/identity_verification.rs        |  2 +-
 src/window.rs                                            |  8 ++++----
 8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/login.rs b/src/login.rs
index 5285dfac7..85d994e8c 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -311,7 +311,7 @@ impl Login {
                     }
                     Err(error) => {
                         warn!("Failed to discover homeserver: {}", error);
-                        obj.parent_window().append_error(&Toast::new(&error.to_user_facing()));
+                        obj.parent_window().add_toast(&Toast::new(&error.to_user_facing()));
                     }
                 };
                 obj.unfreeze();
@@ -345,7 +345,7 @@ impl Login {
                     }
                     Err(error) => {
                         warn!("Failed to check homeserver: {}", error);
-                        obj.parent_window().append_error(&Toast::new(&error.to_user_facing()));
+                        obj.parent_window().add_toast(&Toast::new(&error.to_user_facing()));
                     }
                 };
                 obj.unfreeze();
@@ -459,7 +459,7 @@ impl Login {
                 clone!(@weak self as login => move |session, error| {
                     match error {
                         Some(e) => {
-                            login.parent_window().append_error(&e);
+                            login.parent_window().add_toast(&e);
                             login.unfreeze();
                         },
                         None => {
diff --git a/src/session/content/verification/session_verification.rs 
b/src/session/content/verification/session_verification.rs
index b9de6140e..8e086abe7 100644
--- a/src/session/content/verification/session_verification.rs
+++ b/src/session/content/verification/session_verification.rs
@@ -316,7 +316,7 @@ impl SessionVerification {
 
             if let Some(error_message) = error_message {
                 if let Some(window) = obj.parent_window() {
-                    window.append_error(&Toast::new(&error_message));
+                    window.add_toast(&Toast::new(&error_message));
                 }
             } else {
                 // TODO tell user that the a crypto identity was created
diff --git a/src/session/mod.rs b/src/session/mod.rs
index 9c39bf706..915b64c80 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -700,7 +700,7 @@ impl Session {
             Err(error) => {
                 error!("Couldn’t logout the session {}", error);
                 if let Some(window) = self.parent_window() {
-                    window.append_error(&Toast::new(&gettext("Failed to logout the session.")));
+                    window.add_toast(&Toast::new(&gettext("Failed to logout the session.")));
                 }
             }
         }
diff --git a/src/session/room/event_actions.rs b/src/session/room/event_actions.rs
index 8072008fb..c0105f15c 100644
--- a/src/session/room/event_actions.rs
+++ b/src/session/room/event_actions.rs
@@ -195,7 +195,7 @@ where
                     Ok(res) => res,
                     Err(err) => {
                         error!("Could not get file: {}", err);
-                        window.append_error(&Toast::new(&err.to_user_facing()));
+                        window.add_toast(&Toast::new(&err.to_user_facing()));
 
                         return;
                     }
@@ -244,7 +244,7 @@ where
                     Ok(res) => res,
                     Err(err) => {
                         error!("Could not get file: {}", err);
-                        window.append_error(&Toast::new(&err.to_user_facing()));
+                        window.add_toast(&Toast::new(&err.to_user_facing()));
 
                         return;
                     }
diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs
index 62c8f668c..20de7d7d4 100644
--- a/src/session/room/mod.rs
+++ b/src/session/room/mod.rs
@@ -415,7 +415,7 @@ impl Room {
                                 .build();
 
                             if let Some(window) = obj.session().parent_window() {
-                                window.append_error(&error);
+                                window.add_toast(&error);
                             }
 
                             // Load the previous category
@@ -565,7 +565,7 @@ impl Room {
                                     .build();
 
                                 if let Some(window) = obj.session().parent_window() {
-                                    window.append_error(&error);
+                                    window.add_toast(&error);
                                 }
 
                                 // Load the previous category
@@ -1067,7 +1067,7 @@ impl Room {
                         .build();
 
                     if let Some(window) = self.session().parent_window() {
-                        window.append_error(&error);
+                        window.add_toast(&error);
                     }
 
                     Err(error)
@@ -1099,7 +1099,7 @@ impl Room {
                         .build();
 
                     if let Some(window) = self.session().parent_window() {
-                        window.append_error(&error);
+                        window.add_toast(&error);
                     }
 
                     Err(error)
@@ -1256,7 +1256,7 @@ impl Room {
                     .build();
 
                 if let Some(window) = self.session().parent_window() {
-                    window.append_error(&error);
+                    window.add_toast(&error);
                 }
             }
         } else {
diff --git a/src/session/room_list.rs b/src/session/room_list.rs
index 548bdbaad..7c7c29b34 100644
--- a/src/session/room_list.rs
+++ b/src/session/room_list.rs
@@ -327,7 +327,7 @@ impl RoomList {
                         );
 
                         if let Some(window) = obj.session().parent_window() {
-                            window.append_error(&error);
+                            window.add_toast(&error);
                         }
                     }
                 }
diff --git a/src/session/verification/identity_verification.rs 
b/src/session/verification/identity_verification.rs
index 59e6e4fff..63d55a598 100644
--- a/src/session/verification/identity_verification.rs
+++ b/src/session/verification/identity_verification.rs
@@ -655,7 +655,7 @@ impl IdentityVerification {
         });
 
         if let Some(window) = self.session().parent_window() {
-            window.append_error(&Toast::new(&error_message));
+            window.add_toast(&Toast::new(&error_message));
         }
     }
 
diff --git a/src/window.rs b/src/window.rs
index f92c9a54f..b74ac6f07 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -180,7 +180,7 @@ impl Window {
             }
             Err(error) => {
                 warn!("Failed to restore previous sessions: {:?}", error);
-                self.append_error(&Toast::new(&gettext!(
+                self.add_toast(&Toast::new(&gettext!(
                     "Unable to restore previous sessions: {}",
                     &error.to_user_facing()
                 )));
@@ -252,8 +252,8 @@ impl Window {
         priv_.main_stack.set_visible_child(&*priv_.greeter);
     }
 
-    /// This appends a new error to the list of errors
-    pub fn append_error(&self, error: &Toast) {
-        self.imp().error_list.append(error);
+    /// This appends a new toast to the list
+    pub fn add_toast(&self, toast: &Toast) {
+        self.imp().error_list.append(toast);
     }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]