Skip to content

NotificationsList: remove app entries hashmap #332

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

Merged
danirabbit merged 9 commits into from
Sep 3, 2026
Merged

NotificationsList: remove app entries hashmap #332

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f27f8bd
NotificationsList: remove app entries hashmap
danirabbit Sep 3, 2026
61e2280
merge main
danirabbit Sep 3, 2026
38c4098
Merge branch 'main' into danirabbit/notificationslist-rmappentries
danirabbit Sep 3, 2026
ed6e4ab
merge main
danirabbit Sep 3, 2026
b120adf
better merge
danirabbit Sep 3, 2026
2e1b937
Merge branch 'main' into danirabbit/notificationslist-rmappentries
danirabbit Sep 3, 2026
2e34ba8
Merge main
danirabbit Sep 3, 2026
1a525ed
Merge branch 'main' into danirabbit/notificationslist-rmappentries
zeebok Sep 3, 2026
47f61bb
Actually remove
danirabbit Sep 3, 2026
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
30 changes: 7 additions & 23 deletions src/Widgets/NotificationsList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class Notifications.NotificationsList : Granite.Bin {
public const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";

private static GLib.HashTable<string, GLib.DateTime> app_datetime;
private Gee.HashMap<string, AppEntry> app_entries;

private ListStore list_store;
public ListModel notification_items {
Expand All @@ -21,7 +20,6 @@ public class Notifications.NotificationsList : Granite.Bin {
}

construct {
app_entries = new Gee.HashMap<string, AppEntry> ();
app_datetime = new GLib.HashTable<string, GLib.DateTime> (str_hash, str_equal);

var placeholder = new Gtk.Label (_("No Notifications")) {
Expand Down Expand Up @@ -90,18 +88,13 @@ public class Notifications.NotificationsList : Granite.Bin {
return;
}

var app_entry = app_entries[row_app_id];
if (app_entry == null) {
app_entry = new AppEntry () {
app_name = row_entry.notification.app_name,
app_id = row_app_id
};
app_entry.clear.connect (clear_app_entry);

app_entries[row_app_id] = app_entry;
}
var app_entry = new AppEntry () {
app_name = row_entry.notification.app_name,
app_id = row_app_id
};
app_entry.clear.connect (clear_app_entry);

row.set_header (app_entries[row_app_id]);
row.set_header (app_entry);
}

private Gtk.Widget create_widget_func (Object item) {
Expand All @@ -127,13 +120,7 @@ public class Notifications.NotificationsList : Granite.Bin {
}

public void clear_all () {
var iter = app_entries.map_iterator ();
while (iter.next ()) {
var entry = iter.get_value ();
iter.unset ();
clear_app_entry (entry);
}

Session.get_instance ().clear ();
list_store.remove_all ();
close_popover ();
}
Expand All @@ -149,7 +136,6 @@ public class Notifications.NotificationsList : Granite.Bin {

private void clear_app_entry (AppEntry app_entry) {
app_entry.clear.disconnect (clear_app_entry);
app_entries.unset (app_entry.app_id);

Notification[] to_remove = {};
for (int i = 0; i < list_store.n_items; i++) {
Expand Down Expand Up @@ -187,8 +173,6 @@ public class Notifications.NotificationsList : Granite.Bin {
);

if (items_for_appid.n_items == 0) {
clear_app_entry (app_entries[app_id]);

var settings = new Settings ("io.elementary.panel.notifications");
var headers = (HashTable<string, bool>) settings.get_value ("headers");
if (headers.remove (app_id)) {
Expand Down
Loading