Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MainWindow: Fix memory leaks + improvements #2194

Merged
merged 3 commits into from
Jun 24, 2024
Merged

MainWindow: Fix memory leaks + improvements #2194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbd589a
MainWindow: Fix memory leaks + improvements
leolost2605 Jun 23, 2024
f987626
Merge branch 'main' into leolost/fix-more-mem-leaks
zeebok Jun 24, 2024
6cfd4c7
Merge branch 'main' into leolost/fix-more-mem-leaks
danirabbit Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
public class AppCenter.MainWindow : Gtk.ApplicationWindow {
private Granite.Toast toast;
private Adw.NavigationView navigation_view;
private Granite.OverlayBar overlaybar;

private AppCenterCore.Package? last_installed_package;

Expand Down Expand Up @@ -62,8 +63,8 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
message_dialog.transient_for = this;

message_dialog.present ();
message_dialog.response.connect ((response_id) => {
message_dialog.destroy ();
message_dialog.response.connect ((dialog, response_id) => {
dialog.destroy ();
});
}
}
Expand All @@ -79,7 +80,7 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
};
overlay.add_overlay (toast);

var overlaybar = new Granite.OverlayBar (overlay);
overlaybar = new Granite.OverlayBar (overlay);
overlaybar.bind_property ("active", overlaybar, "visible");

var network_info_bar_label = new Gtk.Label ("<b>%s</b> %s".printf (
Expand Down Expand Up @@ -141,9 +142,7 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
unowned var backend = AppCenterCore.FlatpakBackend.get_default ();
backend.bind_property ("working", overlaybar, "active", SYNC_CREATE);

backend.notify ["job-type"].connect (() => {
overlaybar.label = backend.job_type.to_string ();
});
backend.notify["job-type"].connect (update_overlaybar_label);

overlaybar.label = backend.job_type.to_string ();
}
Expand All @@ -153,23 +152,16 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
installed_view.clear ();
}

unowned var backend = AppCenterCore.FlatpakBackend.get_default ();
if (backend.working) {
hide ();

backend.notify["working"].connect (() => {
if (!visible && !backend.working) {
destroy ();
}
});

AppCenterCore.UpdateManager.get_default ().cancel_updates (false); //Timeouts keep running
return true;
}

((AppCenter.App) application).request_background.begin (() => destroy ());
// We not to wrap in Idle otherwise we crash because libportal hasn't unexported us yet.
((AppCenter.App) application).request_background.begin (() => Idle.add_once (() => {
unowned var backend = AppCenterCore.FlatpakBackend.get_default ();
if (backend.working) {
AppCenterCore.UpdateManager.get_default ().cancel_updates (false); //Timeouts keep running
}
destroy ();
}));

return false;
return true;
}

public void show_package (AppCenterCore.Package package) {
Expand Down Expand Up @@ -246,6 +238,10 @@ public class AppCenter.MainWindow : Gtk.ApplicationWindow {
toast.send_notification ();
}

private void update_overlaybar_label () {
overlaybar.label = AppCenterCore.FlatpakBackend.get_default ().job_type.to_string ();
}

private void show_category (AppStream.Category category) {
var category_view = new CategoryView (category);

Expand Down
Loading