Merge lp:~donadigo/wingpanel-indicator-notifications/code-cleanup into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

[Adam Bieńkowski]

Code cleanup:

* Remove all global variables: use get_instance instead.
* Remove all unneded variables.
* Update code guidelines.
* Separate big callback functions into their own method.
* More constant variables.
* Remove "this." prefixes.

This branch is meant to make the current code easier to read & recognize.

Detailed changes:
* Remove all global variables: use get_instance instead.
* Remove all unneded variables.
* Update code guidelines.
* Separate big callback functions into their own method.
* More constant variables.
* Remove "this." prefixes.

[Danielle Foré (danrabbit)]

Looks like a couple times you have new copyright headers that say 2015 ;)

[Adam Bieńkowski (donadigo)]

> Looks like a couple times you have new copyright headers that say 2015 ;)

Updated.

[lp:~donadigo/wingpanel-indicator-notifications/code-cleanup]

92. By Adam Bieńkowski on 2016-05-27

Code cleanup

[Felipe Escoto (philip.scott)]

Looks good, and it all still woks!

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-09-26 12:51:32 +0000
+++ src/CMakeLists.txt	2016-05-27 15:11:10 +0000
@@ -22,8 +22,9 @@
   Widgets/SeparatorEntry.vala
   Services/NotificationsMonitor.vala
   Services/Notification.vala
-  Services/NSettings.vala
+  Services/NotifySettings.vala
   Services/Session.vala
+  Services/Interfaces.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
   wingpanel-2.0
 
=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-05-26 20:09:37 +0000
+++ src/Indicator.vala	2016-05-27 15:11:10 +0000
@@ -15,27 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Reflects current state of popover.
- * Used to inform the time_label to
- * not change when the popover is shown.
- */
-public bool indicator_opened = false;
-
-/* Notiifcations monitor */
-public NotificationMonitor monitor;
-
-public NSettings nsettings;
-public Settings settings;
-
-public Session session;
-
 public class Indicator : Wingpanel.Indicator {
+    private const string[] EXCEPTIONS = { "wingpanel-indicator-sound", "indicator-sound", "NetworkManager", "gnome-settings-daemon" };
+    private const string CHILD_SCHEMA_ID = "org.pantheon.desktop.gala.notifications.application";
+    private const string CHILD_PATH = "/org/pantheon/desktop/gala/notifications/applications/%s/";
+    private const string REMEMBER_KEY = "remember";
+
     private const uint16 BOX_WIDTH = 300;
     private const uint16 BOX_HEIGHT = 400;
-    private const string[] EXCEPTIONS = { "wingpanel-indicator-sound", "indicator-sound", "NetworkManager", "gnome-settings-daemon" };
-    private static const string CHILD_SCHEMA_ID = "org.pantheon.desktop.gala.notifications.application";
-    private static const string CHILD_PATH = "/org/pantheon/desktop/gala/notifications/applications/%s/";
-    private static const string REMEMBER_KEY = "remember";
+    private const string LIST_ID = "list";
+    private const string NO_NOTIFICATIONS_ID = "no-notifications";
 
     private Wingpanel.Widgets.OverlayIcon? dynamic_icon = null;
     private Gtk.Box? main_box = null;
@@ -51,13 +40,9 @@
                 display_name: _("Notifications indicator"),
                 description:_("The notifications indicator"));
 
-        this.visible = true;
+        visible = true;
 
         app_settings_cache = new Gee.HashMap<string, Settings> ();
-
-        nsettings = new NSettings ();
-        monitor = new NotificationMonitor ();
-        session = new Session ();
     }
 
     public override Gtk.Widget get_display_widget () {
@@ -66,7 +51,7 @@
 
         dynamic_icon.button_press_event.connect ((e) => {
             if (e.button == Gdk.BUTTON_MIDDLE) {
-                nsettings.do_not_disturb = !nsettings.do_not_disturb;
+                NotifySettings.get_instance ().do_not_disturb = !NotifySettings.get_instance ().do_not_disturb;
                 return Gdk.EVENT_STOP;
             }
 
@@ -96,43 +81,30 @@
             scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
             scrolled.add_with_viewport (nlist);
 
-            stack.add_named (scrolled, "list");
-            stack.add_named (no_notifications_label, "no-notifications");
+            stack.add_named (scrolled, LIST_ID);
+            stack.add_named (no_notifications_label, NO_NOTIFICATIONS_ID);
 
-            var not_disturb_switch = new Wingpanel.Widgets.Switch (_("Do Not Disturb"), nsettings.do_not_disturb);
+            var not_disturb_switch = new Wingpanel.Widgets.Switch (_("Do Not Disturb"), NotifySettings.get_instance ().do_not_disturb);
             not_disturb_switch.get_label ().get_style_context ().add_class ("h4");
             not_disturb_switch.get_switch ().notify["active"].connect (() => {
-                nsettings.do_not_disturb = not_disturb_switch.get_switch ().active;
+                NotifySettings.get_instance ().do_not_disturb = not_disturb_switch.get_switch ().active;
             });
 
             clear_all_btn = new Wingpanel.Widgets.Button (_("Clear All Notifications"));
             clear_all_btn.clicked.connect (() => {
                 nlist.clear_all ();
-                session.clear ();
+                Session.get_instance ().clear ();
             });
 
             var settings_btn = new Wingpanel.Widgets.Button (_("Notifications Settings…"));
             settings_btn.clicked.connect (show_settings);
 
-            nlist.close_popover.connect (() => {
-                this.close ();
-            });
-
-            nlist.switch_stack.connect ((list) => {
-                if (list) {
-                    stack.set_visible_child_name ("list");
-                    clear_all_btn.sensitive = true;
-                } else {
-                    stack.set_visible_child_name ("no-notifications");
-                    dynamic_icon.set_main_icon_name (get_display_icon_name ());
-                    clear_all_btn.sensitive = false;
-                }
-            });
-
-            monitor.received.connect (on_notification_received);
-
-            nsettings.changed["do-not-disturb"].connect (() => {
-                not_disturb_switch.get_switch ().active = nsettings.do_not_disturb;
+            nlist.close_popover.connect (() => close ());
+            nlist.switch_stack.connect (on_switch_stack);
+            NotificationMonitor.get_instance ().received.connect (on_notification_received);
+
+            NotifySettings.get_instance ().changed[NotifySettings.DO_NOT_DISTURB_KEY].connect (() => {
+                not_disturb_switch.get_switch ().active = NotifySettings.get_instance ().do_not_disturb;
                 dynamic_icon.set_main_icon_name (get_display_icon_name ());
             });
 
@@ -145,17 +117,7 @@
             main_box.show_all ();
 
             nlist.clear_all ();
-            var previous_session = session.get_session_notifications ();
-            if (previous_session.length () > 0) {
-                previous_session.@foreach ((notification) => {
-                    if (notification.message_body.strip () != "" && notification.summary.strip () != "") {
-                        var entry = new NotificationEntry (notification);
-                        nlist.add_item (entry);
-
-                        dynamic_icon.set_main_icon_name (get_display_icon_name ());                        
-                    }
-                });
-            }
+            restore_previous_session ();
 
             dynamic_icon.set_main_icon_name (get_display_icon_name ());
         }
@@ -164,18 +126,11 @@
     }
 
     public override void opened () {
-        indicator_opened = true;
 
-        nlist.switch_stack (nlist.get_items_length () > 0);
-        if (nlist.get_items_length () > 0) {
-            clear_all_btn.sensitive = true;
-        } else {
-            clear_all_btn.sensitive = false;
-        }
     }
 
     public override void closed () {
-        indicator_opened = false;
+
     }
 
     private void on_notification_received (DBusMessage message, uint32 id) {
@@ -196,7 +151,7 @@
 
         if (schema != null && app_settings == null && appid != "") {
             app_settings = new Settings.full (schema, null, CHILD_PATH.printf (appid));
-            app_settings_cache.set (app_name, app_settings);
+            app_settings_cache.set (appid, app_settings);
         }
 
         if (app_settings == null || (app_settings != null && app_settings.get_boolean (REMEMBER_KEY))) {
@@ -207,8 +162,31 @@
         dynamic_icon.set_main_icon_name (get_display_icon_name ());        
     }
 
+    private void on_switch_stack (bool show_list) {
+        clear_all_btn.sensitive = show_list;
+        if (show_list) {
+            stack.set_visible_child_name (LIST_ID);
+        } else {
+            stack.set_visible_child_name (NO_NOTIFICATIONS_ID);
+        }
+
+        dynamic_icon.set_main_icon_name (get_display_icon_name ());        
+    }
+
+    private void restore_previous_session () {
+        var previous_session = Session.get_instance ().get_session_notifications ();
+        if (previous_session.length () > 0) {
+            previous_session.@foreach ((notification) => {
+                if (notification.message_body.strip () != "" && notification.summary.strip () != "") {
+                    var entry = new NotificationEntry (notification);
+                    nlist.add_item (entry);                     
+                }
+            });
+        }        
+    }
+
     private string get_display_icon_name () {
-        if (nsettings.do_not_disturb) {
+        if (NotifySettings.get_instance ().do_not_disturb) {
             return "notification-disabled-symbolic";
         } else if (nlist != null && nlist.get_items_length () > 0) {
             return "notification-new-symbolic";
@@ -218,7 +196,7 @@
     }
 
     private void show_settings () {
-        this.close ();
+        close ();
 
         var list = new List<string> ();
         list.append ("notifications");
 
=== added file 'src/Services/Interfaces.vala'
--- src/Services/Interfaces.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Interfaces.vala	2016-05-27 15:11:10 +0000
@@ -0,0 +1,39 @@
+/*-
+ * Copyright (c) 2016 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+[DBus (name = "org.freedesktop.Notifications")]
+public interface INotifications : Object {
+    public signal void notification_closed (uint32 id, uint32 reason);
+    public signal void action_invoked (string action, uint32 id);
+    public abstract uint32 notify (string app_name,
+                                uint32 replaces_id,
+                                string app_icon,
+                                string summary,
+                                string body,
+                                string[] actions,
+                                HashTable<string, Variant> hints,
+                                int32 expire_timeout) throws Error;
+}
+
+[DBus (name = "org.freedesktop.DBus")]
+public interface IDBus : Object {
+    [DBus (name = "NameHasOwner")]
+    public abstract bool name_has_owner (string name) throws Error;
+
+    [DBus (name = "GetConnectionUnixProcessID")]
+    public abstract uint32 get_connection_unix_process_id (string name) throws Error;
+}
 
=== modified file 'src/Services/Notification.vala'
--- src/Services/Notification.vala	2016-05-26 20:09:37 +0000
+++ src/Services/Notification.vala	2016-05-27 15:11:10 +0000
@@ -59,26 +59,26 @@
     public Notification.from_message (DBusMessage message, uint32 _id) {
         var body = message.get_body ();
 
-        this.data_session = false;
-
-        this.app_name = this.get_string (body, Column.APP_NAME);
-        this.display_name = app_name;
-        this.app_icon = this.get_string (body, Column.APP_ICON);
-        this.summary = this.get_string (body, Column.SUMMARY);
-        this.message_body = this.get_string (body, Column.BODY);
-        this.hints = body.get_child_value (Column.HINTS);
-        this.expire_timeout = this.get_int32 (body, Column.EXPIRE_TIMEOUT);
-        this.replaces_id = this.get_uint32 (body, Column.REPLACES_ID);
-        this.id = _id;
-        this.sender = message.get_sender ();
-
-        this.actions = body.get_child_value (Column.ACTIONS).dup_strv ();
-        this.timestamp = new DateTime.now_local ();
-        this.unix_time = timestamp.to_unix ();
-
-        this.desktop_id = lookup_string (this.hints, DESKTOP_ENTRY_KEY);
+        data_session = false;
+
+        app_name = get_string (body, Column.APP_NAME);
+        display_name = app_name;
+        app_icon = get_string (body, Column.APP_ICON);
+        summary = get_string (body, Column.SUMMARY);
+        message_body = get_string (body, Column.BODY);
+        hints = body.get_child_value (Column.HINTS);
+        expire_timeout = get_int32 (body, Column.EXPIRE_TIMEOUT);
+        replaces_id = get_uint32 (body, Column.REPLACES_ID);
+        id = _id;
+        sender = message.get_sender ();
+
+        actions = body.get_child_value (Column.ACTIONS).dup_strv ();
+        timestamp = new DateTime.now_local ();
+        unix_time = timestamp.to_unix ();
+
+        desktop_id = lookup_string (hints, DESKTOP_ENTRY_KEY);
         if (desktop_id != "" && !desktop_id.has_suffix (DESKTOP_ID_EXT)) {
-            this.desktop_id += DESKTOP_ID_EXT;
+            desktop_id += DESKTOP_ID_EXT;
         }
 
         appinfo = Utils.get_appinfo_from_app_name (app_name);
@@ -95,26 +95,26 @@
     public Notification.from_data (uint32 _id, string _app_name, string _app_icon,
                                 string _summary, string _message_body,
                                 string[] _actions, int64 _unix_time, string _sender) {
-        this.data_session = true;
+        data_session = true;
 
-        this.app_name = _app_name;
-        this.display_name = app_name;
-        this.app_icon = _app_icon;
-        this.summary = _summary;
-        this.message_body = _message_body;
-        this.expire_timeout = -1;
-        this.replaces_id = 0;
-        this.id = _id;
-        this.sender = _sender;
+        app_name = _app_name;
+        display_name = app_name;
+        app_icon = _app_icon;
+        summary = _summary;
+        message_body = _message_body;
+        expire_timeout = -1;
+        replaces_id = 0;
+        id = _id;
+        sender = _sender;
 
         set_properties ();
         setup_pid ();
 
-        this.actions = _actions;
-        this.unix_time = _unix_time;
-        this.timestamp = new DateTime.from_unix_local (unix_time);
+        actions = _actions;
+        unix_time = _unix_time;
+        timestamp = new DateTime.from_unix_local (unix_time);
 
-        this.desktop_id = "";
+        desktop_id = "";
 
         Timeout.add_seconds_full (Priority.DEFAULT, 60, source_func);
     }
@@ -125,40 +125,40 @@
 
     private void set_properties () {
         if (app_name in OTHER_WHITELIST) {
-            this.display_name = _("Other");
-            this.app_icon = "dialog-information";            
+            display_name = _("Other");
+            app_icon = "dialog-information";            
         }
     }
 
     private void setup_pid () {
-        this.pid_accuired = this.try_get_pid ();
-        nsettings.changed["do-not-disturb"].connect (() => {
+        pid_accuired = try_get_pid ();
+        NotifySettings.get_instance ().changed[NotifySettings.DO_NOT_DISTURB_KEY].connect (() => {
             if (!pid_accuired) {
-                this.try_get_pid ();
+                try_get_pid ();
             }
         });
     }
 
     private bool try_get_pid () {
-        if (nsettings.do_not_disturb) {
+        if (NotifySettings.get_instance ().do_not_disturb) {
             return false;
         }
 
         try {
-            DBusIface? dbusiface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DBus", "/");
-            if (dbusiface.name_has_owner (sender)) {
-                this.pid = dbusiface.get_connection_unix_process_id (sender);
+            IDBus? dbus_iface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DBus", "/");
+            if (dbus_iface != null && dbus_iface.name_has_owner (sender)) {
+                pid = dbus_iface.get_connection_unix_process_id (sender);
             }
         } catch (Error e) {
-            error ("%s\n", e.message);
+            warning ("%s\n", e.message);
         }
 
         return true;
     }
 
     public bool run_default_action () {
-        if (DEFAULT_ACTION in actions) {
-            monitor.niface.action_invoked (DEFAULT_ACTION, id);
+        if (DEFAULT_ACTION in actions && NotificationMonitor.get_instance ().notifications_iface != null) {
+            NotificationMonitor.get_instance ().notifications_iface.action_invoked (DEFAULT_ACTION, id);
             return true;
         }
 
@@ -191,6 +191,6 @@
     }
 
     private bool source_func () {
-        return this.time_changed (timestamp.difference (new DateTime.now_local ()));
+        return time_changed (timestamp.difference (new DateTime.now_local ()));
     }
 }
 
=== modified file 'src/Services/NotificationsMonitor.vala'
--- src/Services/NotificationsMonitor.vala	2016-05-25 19:20:28 +0000
+++ src/Services/NotificationsMonitor.vala	2016-05-27 15:11:10 +0000
@@ -20,46 +20,33 @@
  * http://bazaar.launchpad.net/~jconti/recent-notifications/gnome3/view/head:/src/recent-notifications.vala
  */
 
-[DBus (name = "org.freedesktop.Notifications")]
-public interface NIface : Object {
-    public signal void notification_closed (uint32 id, uint32 reason);
-    public signal void action_invoked (string action, uint32 id);
-    public abstract uint32 notify (string app_name,
-                                uint32 replaces_id,
-                                string app_icon,
-                                string summary,
-                                string body,
-                                string[] actions,
-                                HashTable<string, Variant> hints,
-                                int32 expire_timeout) throws Error;
-}
-
-[DBus (name = "org.freedesktop.DBus")]
-public interface DBusIface : Object {
-    [DBus (name = "NameHasOwner")]
-    public abstract bool name_has_owner (string name) throws Error;
-
-    [DBus (name = "GetConnectionUnixProcessID")]
-    public abstract uint32 get_connection_unix_process_id (string name) throws Error;
-}
-
 public class NotificationMonitor : Object {
     private const string NOTIFY_IFACE = "org.freedesktop.Notifications";
     private const string NOTIFY_PATH = "/org/freedesktop/Notifications";
     private const string MATCH_STRING = "eavesdrop='true',type='method_call',interface='org.freedesktop.Notifications',member='Notify'";
     private const uint32 REASON_DISMISSED = 2;
 
+    private static NotificationMonitor? instance = null;
+
     private DBusConnection connection;
-    public NIface? niface = null;
-    public DBusIface? dbusiface = null;
+    public INotifications? notifications_iface = null;
+    public IDBus? dbus_iface = null;
     private uint32 id_counter = 0;
 
     public signal void received (DBusMessage message, uint32 id);
 
-    public NotificationMonitor () {
+    public static NotificationMonitor get_instance () {
+        if (instance == null) {
+            instance = new NotificationMonitor ();
+        }
+
+        return instance;
+    }
+
+    private NotificationMonitor () {
         try {
             connection = Bus.get_sync (BusType.SESSION);
-            this.add_filter ();  
+            add_filter ();  
         } catch (Error e) {
             error ("%s\n", e.message);
         }
@@ -75,7 +62,7 @@
         message.set_body (body);
         
         try {
-            niface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
+            notifications_iface = Bus.get_proxy_sync (BusType.SESSION, NOTIFY_IFACE, NOTIFY_PATH); 
         } catch (Error e) {
             error ("%s\n", e.message);
         }
@@ -103,10 +90,10 @@
                     current_id = id_counter;
                 }
 
-                if (nsettings.do_not_disturb) {
+                if (NotifySettings.get_instance ().do_not_disturb) {
                     this.received (message, current_id);
                 } else {
-                    niface.notification_closed.connect ((id, reason) => {
+                    notifications_iface.notification_closed.connect ((id, reason) => {
                         if (id == 1) {
                             id_counter = id;
                             current_id = id_counter;
@@ -133,7 +120,7 @@
         hints.insert ("suppress-sound", new Variant.boolean (true));
         string[] actions = {};
         try {
-            return niface.notify ("", 0, "", "", "", actions, hints, 1);
+            return notifications_iface.notify ("", 0, "", "", "", actions, hints, 1);
         } catch (Error e) {
             error ("%s\n", e.message);
         }
 
=== renamed file 'src/Services/NSettings.vala' => 'src/Services/NotifySettings.vala'
--- src/Services/NSettings.vala	2015-09-22 14:51:12 +0000
+++ src/Services/NotifySettings.vala	2016-05-27 15:11:10 +0000
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ * Copyright (c) 2016 Wingpanel Developers (http://launchpad.net/wingpanel)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as published by
@@ -15,10 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class NSettings : Granite.Services.Settings {
+public class NotifySettings : Granite.Services.Settings {
+    public static const string DO_NOT_DISTURB_KEY = "do-not-disturb";
+    public static NotifySettings? instance = null;
+
     public bool do_not_disturb { get; set; }
 
-    public NSettings () {
+    public static unowned NotifySettings get_instance () {
+        if (instance == null) {
+            instance = new NotifySettings ();
+        }
+
+        return instance;
+    }
+
+    private NotifySettings () {
         base ("org.pantheon.desktop.gala.notifications");
     }
 }
 \ No newline at end of file
 
=== modified file 'src/Services/Session.vala'
--- src/Services/Session.vala	2016-05-26 19:56:13 +0000
+++ src/Services/Session.vala	2016-05-27 15:11:10 +0000
@@ -23,6 +23,8 @@
  */
 public class Session : GLib.Object {
     private const string SESSION_NAME_FILE = "/.notifications.session";
+    private static Session? instance = null;
+
     private static File? session_file = null;
     private static string full_path;
     
@@ -36,7 +38,15 @@
 
     private KeyFile key;
 
-    public Session () {
+    public static Session get_instance () {
+        if (instance == null) {
+            instance = new Session ();
+        }
+
+        return instance;
+    }
+
+    private Session () {
         full_path = Environment.get_user_cache_dir () + SESSION_NAME_FILE;
         session_file = File.new_for_path (full_path);
         if (!session_file.query_exists ())
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-05-26 18:51:03 +0000
+++ src/Widgets/AppEntry.vala	2016-05-27 15:11:10 +0000
@@ -33,11 +33,11 @@
         margin_end = 6;
 
         var notification = entry.notification;
-        this.app_name = notification.app_name;
-        this.app_window = _app_window;
+        app_name = notification.app_name;
+        app_window = _app_window;
 
         app_notifications = new List<NotificationEntry> ();
-        this.add_notification_entry (entry);
+        add_notification_entry (entry);
 
         appinfo = notification.appinfo;
 
@@ -59,7 +59,7 @@
         clear_btn_entry = new Gtk.Button.from_icon_name ("edit-clear-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
         clear_btn_entry.get_style_context ().add_class ("flat");
         clear_btn_entry.clicked.connect (() => {
-            this.destroy_entry ();
+            destroy_entry ();
         });
 
         string icon = "";
@@ -75,33 +75,33 @@
         hbox.pack_start (label, false, false, 0);
         hbox.pack_end (clear_btn_entry, false, false, 0);
 
-        this.connect_entry (entry);
+        connect_entry (entry);
 
-        this.add (hbox);
-        this.show_all ();
+        add (hbox);
+        show_all ();
     }
 
     private void connect_entry (NotificationEntry entry) {
         entry.clear.connect (() => {
             if (entry != null) {
-                this.remove_notification_entry (entry);
+                remove_notification_entry (entry);
             }
         });
     }
 
     public unowned List<NotificationEntry> get_notifications () {
-        return this.app_notifications;
+        return app_notifications;
     }
 
     public void add_notification_entry (NotificationEntry entry) {
         app_notifications.prepend (entry);
-        this.connect_entry (entry);
+        connect_entry (entry);
     }
 
     public void remove_notification_entry (NotificationEntry entry) {
         app_notifications.remove (entry);
         if (app_notifications.length () == 0) {
-            this.destroy_entry ();
+            destroy_entry ();
         }
     }
 }
 
=== modified file 'src/Widgets/NotificationEntry.vala'
--- src/Widgets/NotificationEntry.vala	2016-05-24 17:51:39 +0000
+++ src/Widgets/NotificationEntry.vala	2016-05-27 15:11:10 +0000
@@ -40,20 +40,20 @@
     }
 
     public NotificationEntry (Notification _notification) {
-        this.notification = _notification;
-        this.entry_summary = notification.summary;
-        this.entry_body = notification.message_body;
+        notification = _notification;
+        entry_summary = notification.summary;
+        entry_body = notification.message_body;
 
-        this.get_style_context ().add_class ("menuitem");
+        get_style_context ().add_class ("menuitem");
 
         notification.time_changed.connect ((timespan) => {
             string label = get_string_from_timespan (timespan);
             time_label.label = label;
 
-            return this.active;
+            return active;
         });
 
-        this.hexpand = true;
+        hexpand = true;
         add_widgets ();
 
         if (notification.data_session) {
@@ -90,8 +90,8 @@
             grid.attach (body_label, 0, 1, 2, 1);
         }
 
-        this.add (grid);
-        this.show_all ();
+        add (grid);
+        show_all ();
     }
 
     /**
 
=== modified file 'src/Widgets/NotificationsList.vala'
--- src/Widgets/NotificationsList.vala	2016-05-26 19:35:36 +0000
+++ src/Widgets/NotificationsList.vala	2016-05-27 15:11:10 +0000
@@ -16,7 +16,7 @@
  */
 
 public class NotificationsList : Gtk.ListBox {
-    public signal void switch_stack (bool list);
+    public signal void switch_stack (bool show_list);
     public signal void close_popover ();
     private List<AppEntry> app_entries;
     private List<NotificationEntry> items;
@@ -26,11 +26,11 @@
     private static Wnck.Screen screen;
 
     public NotificationsList () {
-        this.margin_top = 2;
+        margin_top = 2;
 
-        this.activate_on_single_click = true;
-        this.selection_mode = Gtk.SelectionMode.NONE;
-        this.row_activated.connect (on_row_activated);
+        activate_on_single_click = true;
+        selection_mode = Gtk.SelectionMode.NONE;
+        row_activated.connect (on_row_activated);
 
         items = new List<NotificationEntry> ();
         app_entries = new List<AppEntry> ();
@@ -38,34 +38,34 @@
 
         screen = Wnck.Screen.get_default ();
 
-        this.vexpand = true;
-        this.show_all ();
+        vexpand = true;
+        show_all ();
     }
 
     public void add_item (NotificationEntry entry) {
-        var app_entry = this.add_app_entry (entry);
+        var app_entry = add_app_entry (entry);
 
         items.prepend (entry);
-        this.switch_stack (true);
+        switch_stack (true);
 
         app_entry.add_notification_entry (entry);
-        this.resort_from_app_entry (app_entry);
+        resort_from_app_entry (app_entry);
 
         entry.clear.connect (() => {
-            this.destroy_notification_entry (entry);
+            destroy_notification_entry (entry);
         });
 
         app_entry.destroy_entry.connect (() => {
-            this.destroy_app_entry (app_entry);
+            destroy_app_entry (app_entry);
         });
 
         counter = counter + 2;
 
-        session.add_notification (entry.notification);
+        Session.get_instance ().add_notification (entry.notification);
         entry.show_all ();
 
-        this.update_separators ();
-        this.show_all ();
+        update_separators ();
+        show_all ();
     }
 
 
@@ -76,47 +76,47 @@
     public void clear_all () {
         items.@foreach ((item) => {
             items.remove (item);
-            this.remove (item);
+            remove (item);
             item.active = false;
         });
 
         app_entries.@foreach ((entry) => {
             app_entries.remove (entry);
-            this.remove (entry);
+            remove (entry);
         });
 
         counter = 0;
 
-        session.clear ();
-        this.switch_stack (false);
-        this.close_popover ();
-        this.show_all ();
+        Session.get_instance ().clear ();
+        switch_stack (false);
+        close_popover ();
+        show_all ();
     }
 
     private void update_separators () {
-        if (this.get_children ().length () > 0) {
-            foreach (var child in this.get_children ()) {
+        if (get_children ().length () > 0) {
+            foreach (var child in get_children ()) {
                 if (child is SeparatorEntry) {
-                    this.remove (child);
+                    remove (child);
                 }
             }
 
             foreach (var app_entry in app_entries) {
-                if (app_entry.get_index () != 0 && this.get_children ().nth_data (1) != app_entry) {
+                if (app_entry.get_index () != 0 && get_children ().nth_data (1) != app_entry) {
                     var row = new SeparatorEntry ();
-                    this.insert (row, app_entry.get_index ());
+                    insert (row, app_entry.get_index ());
                 }
             }
         }
 
-        this.show_all ();
+        show_all ();
     }
 
     private AppEntry add_app_entry (NotificationEntry entry) {
         AppEntry app_entry;
         bool add = !(entry.notification.app_name in construct_app_names ());
         if (add) {
-            var window = this.get_window_from_entry (entry);
+            var window = get_window_from_entry (entry);
             app_entry = new AppEntry (entry, window);
 
             screen.active_window_changed.connect (() => {
@@ -126,14 +126,14 @@
             });
 
             app_entries.append (app_entry);
-            this.prepend (app_entry);
-            this.insert (entry, 1);
+            prepend (app_entry);
+            insert (entry, 1);
             table.insert (app_entry.app_name, 0);
         } else {
             app_entry = get_app_entry_from_app_name (entry.notification.app_name);
             if (app_entry != null) {
                 int insert_pos = table.@get (app_entry.app_name);
-                this.insert (entry, insert_pos + 1);                
+                insert (entry, insert_pos + 1);                
             }
         }
 
@@ -157,9 +157,9 @@
         items.remove (entry);
         entry.active = false;
 
-        session.remove_notification (entry.notification);
+        Session.get_instance ().remove_notification (entry.notification);
         if (items.length () == 0) {
-            this.clear_all ();
+            clear_all ();
         }
     }
 
@@ -167,7 +167,7 @@
         app_entries.remove (app_entry);
 
         app_entry.get_notifications ().@foreach ((notification_entry) => {
-            this.remove (notification_entry);
+            remove (notification_entry);
             items.remove (notification_entry);
         });
 
@@ -180,20 +180,20 @@
         });
 
         if (items.length () == 0) {
-            this.clear_all ();
+            clear_all ();
         }
 
-        this.update_separators ();
+        update_separators ();
     }
 
     private void resort_from_app_entry (AppEntry app_entry) {
-        if (this.get_row_at_index (0) != app_entry) {
-            this.remove (app_entry);
-            this.prepend (app_entry);
+        if (get_row_at_index (0) != app_entry) {
+            remove (app_entry);
+            prepend (app_entry);
             int counter = 1;
             app_entry.get_notifications ().@foreach ((notification_entry) => {
-                this.remove (notification_entry);
-                this.add_item (notification_entry);
+                remove (notification_entry);
+                add_item (notification_entry);
                 counter++;
             });
         }
@@ -232,7 +232,7 @@
             if (((AppEntry) row).app_window != null) {
                 ((AppEntry) row).app_window.unminimize (Gtk.get_current_event_time ());
                 ((AppEntry) row).clear_btn_entry.clicked ();
-                this.close_popover ();
+                close_popover ();
             } else if (((AppEntry) row).appinfo != null) {
                 try {
                     ((AppEntry) row).appinfo.launch (null, null);
@@ -241,17 +241,17 @@
                 }
 
                 ((AppEntry) row).clear_btn_entry.clicked ();
-                this.close_popover ();
+                close_popover ();
             }
         } else {
             if (((NotificationEntry) row).notification.run_default_action ()) {
                 ((NotificationEntry) row).active = false;
-                this.close_popover ();
+                close_popover ();
             }
 
             ((NotificationEntry) row).clear ();
         }
 
-        this.update_separators ();
+        update_separators ();
     }
 }
 
=== modified file 'src/Widgets/SeparatorEntry.vala'
--- src/Widgets/SeparatorEntry.vala	2015-07-16 10:11:58 +0000
+++ src/Widgets/SeparatorEntry.vala	2016-05-27 15:11:10 +0000
@@ -16,10 +16,9 @@
  */
 
  public class SeparatorEntry : Gtk.ListBoxRow {
-
  	public SeparatorEntry () {
- 		this.activatable = this.selectable = false;
- 		this.add (new Wingpanel.Widgets.Separator ());
- 		this.show_all ();
+ 		activatable = selectable = false;
+ 		add (new Wingpanel.Widgets.Separator ());
+ 		show_all ();
  	}
  }
 \ No newline at end of file