vv
/
fractal
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

misc: Always use generated connect_{*}_notify() method 

Avoids possible errors in the name of properties and helps in case they
are renamed.
This commit is contained in:
Kévin Commaille 2023-12-20 16:52:51 +01:00
parent e5f82d2fe2
commit 9d2d8c389c
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
12 changed files with 39 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/application.rs
View File

@ -48,15 +48,13 @@ mod imp {
app.set_up_gactions();
app.set_up_accels();
self.session_list.connect_notify_local(
Some("error"),
clone!(@weak app => move |session_list, _| {
self.session_list
.connect_error_notify(clone!(@weak app => move |session_list| {
if let Some(message) = session_list.error() {
let window = app.present_main_window();
window.show_secret_error(&message);
}
}),
);
}));
spawn!(
clone!(@weak self.session_list as session_list => async move {
session_list.restore_sessions().await;

11
src/login/homeserver_page.rs
View File

@ -64,13 +64,10 @@ mod imp {
self.login.disconnect_signals();
if let Some(login) = login {
let handler = login.connect_notify_local(
Some("autodiscovery"),
clone!(@weak obj => move |_, _| {
obj.update_next_state();
obj.update_text();
}),
);
let handler = login.connect_autodiscovery_notify(clone!(@weak obj => move |_| {
obj.update_next_state();
obj.update_text();
}));
self.login.set(login, vec![handler]);
}

9
src/session/model/sidebar_data/item_list.rs
View File

@ -57,12 +57,9 @@ mod imp {
for item in list.iter() {
if let Some(category) = item.downcast_ref::<Category>() {
category.connect_notify_local(
Some("empty"),
clone!(@weak obj => move |category, _| {
obj.update_item(category);
}),
);
category.connect_empty_notify(clone!(@weak obj => move |category| {
obj.update_item(category);
}));
}
obj.update_item(item);
}

8
src/session/view/account_settings/devices_page/device_row.rs
View File

@ -91,12 +91,10 @@ mod imp {
}));
let system_settings = Application::default().system_settings();
let system_settings_handler = system_settings.connect_notify_local(
Some("clock-format"),
clone!(@weak obj => move |_,_| {
let system_settings_handler =
system_settings.connect_clock_format_notify(clone!(@weak obj => move |_| {
obj.update_last_seen_ts();
}),
);
}));
self.system_settings_handler
.replace(Some(system_settings_handler));
}

18
src/session/view/content/explore/mod.rs
View File

@ -114,19 +114,13 @@ mod imp {
self.listview
.set_model(Some(&gtk::NoSelection::new(Some(public_room_list.clone()))));
public_room_list.connect_notify_local(
Some("loading"),
clone!(@weak obj => move |_, _| {
obj.update_visible_child();
}),
);
public_room_list.connect_loading_notify(clone!(@weak obj => move |_| {
obj.update_visible_child();
}));
public_room_list.connect_notify_local(
Some("empty"),
clone!(@weak obj => move |_, _| {
obj.update_visible_child();
}),
);
public_room_list.connect_empty_notify(clone!(@weak obj => move |_| {
obj.update_visible_child();
}));
self.public_room_list.replace(Some(public_room_list));
obj.update_visible_child();

7
src/session/view/content/invite.rs
View File

@ -68,10 +68,9 @@ mod imp {
fn constructed(&self) {
self.parent_constructed();
self.room_topic
.connect_notify_local(Some("label"), |room_topic, _| {
room_topic.set_visible(!room_topic.label().is_empty());
});
self.room_topic.connect_label_notify(|room_topic| {
room_topic.set_visible(!room_topic.label().is_empty());
});
self.room_topic
.set_visible(!self.room_topic.label().is_empty());

5
src/session/view/content/room_details/invite_subpage/invitee_list.rs
View File

@ -207,9 +207,8 @@ impl InviteeList {
item.display_name.as_deref(),
item.avatar_url.as_deref(),
);
user.connect_notify_local(
Some("invited"),
clone!(@weak self as obj => move |user, _| {
user.connect_invited_notify(
clone!(@weak self as obj => move |user| {
if user.invited() && user.invite_exception().is_none() {
obj.add_invitee(user.clone());
} else {

8
src/session/view/content/room_history/member_timestamp/row.rs
View File

@ -48,12 +48,10 @@ mod imp {
let obj = self.obj();
let system_settings = Application::default().system_settings();
let system_settings_handler = system_settings.connect_notify_local(
Some("clock-format"),
clone!(@weak obj => move |_,_| {
let system_settings_handler =
system_settings.connect_clock_format_notify(clone!(@weak obj => move |_| {
obj.update_timestamp();
}),
);
}));
self.system_settings_handler
.replace(Some(system_settings_handler));
}

8
src/session/view/content/room_history/message_row/mod.rs
View File

@ -99,12 +99,10 @@ mod imp {
));
let system_settings = Application::default().system_settings();
let system_settings_handler = system_settings.connect_notify_local(
Some("clock-format"),
clone!(@weak obj => move |_,_| {
let system_settings_handler =
system_settings.connect_clock_format_notify(clone!(@weak obj => move |_| {
obj.update_timestamp();
}),
);
}));
self.system_settings_handler
.replace(Some(system_settings_handler));
}

2
src/session/view/media_viewer.rs
View File

@ -170,7 +170,7 @@ mod imp {
self.swipe_tracker.set(swipe_tracker).unwrap();
// Bind `fullscreened` to the window property of the same name.
obj.connect_notify_local(Some("root"), |obj, _| {
obj.connect_root_notify(|obj| {
if let Some(window) = obj.root().and_downcast::<Window>() {
window
.bind_property("fullscreened", obj, "fullscreened")

8
src/session/view/session_view.rs
View File

@ -130,9 +130,8 @@ mod imp {
}),
);
self.content.connect_notify_local(
Some("item"),
clone!(@weak obj => move |_, _| {
self.content
.connect_item_notify(clone!(@weak obj => move |_| {
let Some(session) = obj.session() else {
return;
};
@ -142,8 +141,7 @@ mod imp {
// When switching to a room, withdraw its notifications.
session.notifications().withdraw_all_for_room(&room);
}),
);
}));
obj.connect_root_notify(|obj| {
let Some(window) = obj.parent_window() else {

13
src/window.rs
View File

@ -196,14 +196,11 @@ mod imp {
obj.switch_to_greeter_page();
}
} else {
session_list.connect_notify_local(
Some("state"),
clone!(@weak obj => move |session_list, _| {
if session_list.state() == LoadingState::Ready && session_list.is_empty() {
obj.switch_to_greeter_page();
}
}),
);
session_list.connect_state_notify(clone!(@weak obj => move |session_list| {
if session_list.state() == LoadingState::Ready && session_list.is_empty() {
obj.switch_to_greeter_page();
}
}));
}
let monitor = gio::NetworkMonitor::default();