Skip to content

NotificationsList: simplify add_entry #162

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 12 commits into from
Apr 15, 2021
Merged

NotificationsList: simplify add_entry #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cd5cbdc
NotificationsList: simplify add_entry
danirabbit Oct 29, 2020
33fe7c3
get rid of check for nothing
danirabbit Oct 29, 2020
96c5399
Merge branch 'master' into notificationslist-simpleradd
Oct 30, 2020
3f2c274
Merge branch 'master' into notificationslist-simpleradd
Oct 31, 2020
ddc6e0d
Merge branch 'master' into notificationslist-simpleradd
danirabbit Oct 31, 2020
f9e3e6d
Merge branch 'master' into notificationslist-simpleradd
meisenzahl Nov 4, 2020
74eb48b
Merge master
Nov 9, 2020
099821d
Merge branch 'master' into notificationslist-simpleradd
Nov 9, 2020
c4fa0be
Fix faulty merge
Nov 9, 2020
0c14af8
Merge branch 'master' into notificationslist-simpleradd
danirabbit Nov 17, 2020
6b8b2a0
Merge branch 'master' into notificationslist-simpleradd
Apr 7, 2021
17e4010
Update NotificationsList.vala
danirabbit Apr 12, 2021
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
6 changes: 4 additions & 2 deletions src/Services/Notification.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ public class Notifications.Notification : Object {
timestamp = new GLib.DateTime.now_local ();

desktop_id = lookup_string (hints, DESKTOP_ENTRY_KEY);
if (desktop_id != "" && !desktop_id.has_suffix (DESKTOP_ID_EXT)) {
desktop_id += DESKTOP_ID_EXT;
if (desktop_id != null && desktop_id != "") {
if (!desktop_id.has_suffix (DESKTOP_ID_EXT)) {
desktop_id += DESKTOP_ID_EXT;
}

app_info = new DesktopAppInfo (desktop_id);
}
Expand Down
45 changes: 20 additions & 25 deletions src/Widgets/NotificationsList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,31 @@ public class Notifications.NotificationsList : Gtk.ListBox {
}

public void add_entry (Notification notification) {
if (notification.app_info != null && notification.app_info.get_id () != null) {
AppEntry? app_entry = null;

if (app_entries[notification.desktop_id] != null) {
app_entry = app_entries[notification.desktop_id];
}

var entry = new NotificationEntry (notification);
if (app_entry == null) {
app_entry = new AppEntry (notification.app_info);
app_entry.add_notification_entry (entry);
app_entries[notification.desktop_id] = app_entry;

prepend (app_entry);
insert (entry, 1);
table.insert (app_entry.app_id, 0);
} else {
resort_app_entry (app_entry);
app_entry.add_notification_entry (entry);

int insert_pos = table.get (app_entry.app_id);
insert (entry, insert_pos + 1);
}
var entry = new NotificationEntry (notification);

if (app_entries[notification.desktop_id] != null) {
var app_entry = app_entries[notification.desktop_id];

resort_app_entry (app_entry);
app_entry.add_notification_entry (entry);

int insert_pos = table.get (app_entry.app_id);
insert (entry, insert_pos + 1);
} else {
var app_entry = new AppEntry (notification.app_info);
app_entry.add_notification_entry (entry);
app_entry.clear.connect (clear_app_entry);

show_all ();
app_entries[notification.desktop_id] = app_entry;

Session.get_instance ().add_notification (notification);
prepend (app_entry);
insert (entry, 1);
table.insert (app_entry.app_id, 0);
}

show_all ();

Session.get_instance ().add_notification (notification);
}

public void clear_all () {
Expand Down