Remove Session.vala

meson.build

@@ -45,7 +45,6 @@ shared_module(
     'src/Widgets/AppEntry.vala',
     'src/Services/NotificationsMonitor.vala',
     'src/Services/Notification.vala',
-    'src/Services/Session.vala',
     'src/Services/Interfaces.vala',
     gresource,
     config_vala,

po/POTFILES

@@ -4,5 +4,4 @@ src/Widgets/NotificationEntry.vala
 src/Widgets/AppEntry.vala
 src/Services/NotificationsMonitor.vala
 src/Services/Notification.vala
-src/Services/Session.vala
 src/Services/Interfaces.vala

src/Indicator.vala

@@ -27,7 +27,6 @@ public class Notifications.Indicator : Wingpanel.Indicator {
     private Gtk.ModelButton clear_all_btn;
     private Gtk.Spinner? dynamic_icon = null;
     private NotificationsList nlist;
-    private List<Notification> previous_session = null;
 
     public Indicator () {
         Object (
@@ -77,27 +76,14 @@ public class Notifications.Indicator : Wingpanel.Indicator {
                 return Gdk.EVENT_PROPAGATE;
             });
 
-            previous_session = Session.get_instance ().get_session_notifications ();
-            Timeout.add (2000, () => { // Do not block animated drawing of wingpanel
-                load_session_notifications.begin (() => { // load asynchromously so spinner continues to rotate
-                    set_display_icon_name ();
-                    nlist.add.connect (set_display_icon_name);
-                    nlist.remove.connect (set_display_icon_name);
-                });
-
-                return Source.REMOVE;
-            });
+            set_display_icon_name ();
+            nlist.add.connect (set_display_icon_name);
+            nlist.remove.connect (set_display_icon_name);
         }
 
         return dynamic_icon;
     }
 
-    private async void load_session_notifications () {
-        foreach (var notification in previous_session) {
-            yield nlist.add_entry (notification, false); // This is slow as NotificationEntry is complex
-        }
-    }
-
     public override Gtk.Widget? get_widget () {
         if (main_box == null) {
             var not_disturb_switch = new Granite.SwitchModelButton (_("Do Not Disturb"));
@@ -177,7 +163,7 @@ public class Notifications.Indicator : Wingpanel.Indicator {
         }
 
         if (app_settings == null || app_settings.get_boolean (REMEMBER_KEY)) {
-            nlist.add_entry.begin (notification, true);
+            nlist.add_entry (notification);
         }
 
         set_display_icon_name ();

src/Services/Notification.vala

@@ -35,7 +35,6 @@ public class Notifications.Notification : Object {
     public string[] actions;
     public uint32 replaces_id;
     public uint32 id;
-    public bool has_temp_file;
     public GLib.DateTime timestamp;
     public GLib.Icon badge_icon { get; construct set; }
 
@@ -59,28 +58,6 @@ public class Notifications.Notification : Object {
     private const string DESKTOP_ENTRY_KEY = "desktop-entry";
     private const string FALLBACK_DESKTOP_ID = "gala-other" + DESKTOP_ID_EXT;
 
-    public Notification (
-        uint32 _id, string _app_name, string _app_icon, string _summary, string _message_body, string _image_path,
-        string[] _actions, string _desktop_id, int64 _unix_time, uint64 _replaces_id, string _sender, bool _has_temp_file
-    ) {
-        app_name = _app_name;
-        app_icon = _app_icon;
-        summary = _summary;
-        message_body = _message_body;
-        image_path = _image_path;
-        replaces_id = (uint32) _replaces_id;
-        id = _id;
-        sender = _sender;
-
-        actions = _actions;
-        timestamp = new GLib.DateTime.from_unix_local (_unix_time);
-
-        desktop_id = _desktop_id;
-        app_info = new DesktopAppInfo (desktop_id);
-
-        has_temp_file = _has_temp_file;
-    }
-
     public Notification.from_message (DBusMessage message, uint32 _id) {
         var body = message.get_body ();
 
@@ -131,7 +108,6 @@ public class Notifications.Notification : Object {
             var tmpfile = store_pixbuf (buf);
             if (tmpfile != null) {
                 image_path = tmpfile;
-                has_temp_file = true;
             }
         }
 

src/Widgets/AppEntry.vala

@@ -76,7 +76,6 @@ public class Notifications.AppEntry : Gtk.ListBoxRow {
         app_notifications.remove (entry);
         entry.dismiss ();
 
-        Session.get_instance ().remove_notification (entry.notification);
         if (app_notifications.length () == 0) {
             clear ();
         }
@@ -90,6 +89,5 @@ public class Notifications.AppEntry : Gtk.ListBoxRow {
         });
 
         app_notifications = new List<NotificationEntry> ();
-        Session.get_instance ().remove_notifications (to_remove);
     }
 }

src/Widgets/NotificationsList.vala

@@ -46,7 +46,7 @@ public class Notifications.NotificationsList : Gtk.ListBox {
         row_activated.connect (on_row_activated);
     }
 
-    public async void add_entry (Notification notification, bool add_to_session = true, bool write_file = true) {
+    public void add_entry (Notification notification) {
         var entry = new NotificationEntry (notification);
 
         if (app_entries[notification.desktop_id] != null) {
@@ -70,13 +70,6 @@ public class Notifications.NotificationsList : Gtk.ListBox {
         }
 
         show_all ();
-
-        Idle.add (add_entry.callback);
-        yield;
-
-        if (add_to_session) { // If notification was obtained from session do not write it back
-            Session.get_instance ().add_notification (notification);
-        }
     }
 
     public uint count_notifications (out uint number_of_apps) {
@@ -121,10 +114,6 @@ public class Notifications.NotificationsList : Gtk.ListBox {
         app_entries.unset (app_entry.app_id);
         app_entry.clear_all_notification_entries ();
         app_entry.destroy ();
-
-        if (app_entries.size == 0) {
-            Session.get_instance ().clear ();
-        }
     }
 
     private void on_row_activated (Gtk.ListBoxRow row) {