1 files changed, 42 insertions, 50 deletions
diff --git a/src/watcher.vala b/src/watcher.vala
index cf06c7d..974cd02 100644
--- a/src/watcher.vala
+++ b/src/watcher.vala
@@ -1,67 +1,59 @@
 namespace AstalTray {
+[DBus (name="org.kde.StatusNotifierWatcher")]
+internal class StatusNotifierWatcher : Object {
+    private HashTable<string, string> _items =
+        new HashTable<string, string>(str_hash, str_equal);
 
-  [DBus (name="org.kde.StatusNotifierWatcher")]
-    internal class StatusNotifierWatcher : Object {
+    public string[] RegisteredStatusNotifierItems { owned get { return _items.get_values_as_ptr_array().data; } }
+    public bool IsStatusNotifierHostRegistered { get; default = true; }
+    public int ProtocolVersion { get; default = 0; }
 
-      private HashTable<string, string> _items;
+    public signal void StatusNotifierItemRegistered(string service);
+    public signal void StatusNotifierItemUnregistered(string service);
+    public signal void StatusNotifierHostRegistered();
+    public signal void StatusNotifierHostUnregistered();
 
-      public string[] RegisteredStatusNotifierItems { owned get { return _items.get_values_as_ptr_array().data; } }
-      public bool IsStatusNotifierHostRegistered { get; default = true; }
-      public int ProtocolVersion { get; default = 0; }
-
-      public signal void StatusNotifierItemRegistered(string service);
-      public signal void StatusNotifierItemUnregistered(string service);
-      public signal void StatusNotifierHostRegistered();
-      public signal void StatusNotifierHostUnregistered();
-
-      construct {
-        _items = new HashTable<string, string>(GLib.str_hash, GLib.str_equal);
-      }
-
-      public void RegisterStatusNotifierItem(string service, BusName sender) throws DBusError, IOError {
+    public void RegisterStatusNotifierItem(string service, BusName sender) throws DBusError, IOError {
         string busName;
         string path;
-        if(service[0] == '/') {
-          path = service;
-          busName = sender;
-        }
-        else {
-          busName = service;
-          path = "/StatusNotifierItem";
+        if (service[0] == '/') {
+            path = service;
+            busName = sender;
+        } else {
+            busName = service;
+            path = "/StatusNotifierItem";
         }
 
         Bus.get_sync(BusType.SESSION).signal_subscribe(
-          null,
-          "org.freedesktop.DBus",
-          "NameOwnerChanged",
-          null,
-          null,
-          DBusSignalFlags.NONE,
-          (connection, sender_name, path, interface_name, signal_name, parameters) => {
-            string name = null;
-            string new_owner = null;
-            string old_owner = null;
-            parameters.get("(sss)", &name, &old_owner, &new_owner);
-            if(new_owner == "" && _items.contains(old_owner)){
-              string full_path = _items.take(old_owner);
-              StatusNotifierItemUnregistered(full_path);
+            null,
+            "org.freedesktop.DBus",
+            "NameOwnerChanged",
+            null,
+            null,
+            DBusSignalFlags.NONE,
+            (connection, sender_name, path, interface_name, signal_name, parameters) => {
+                string name = null;
+                string new_owner = null;
+                string old_owner = null;
+                parameters.get("(sss)", &name, &old_owner, &new_owner);
+                if (new_owner == "" && _items.contains(old_owner)) {
+                    string full_path = _items.take(old_owner);
+                    StatusNotifierItemUnregistered(full_path);
+                }
             }
-          }
         );
 
         _items.set(busName, busName+path);
-
         StatusNotifierItemRegistered(busName+path);
-      }
+    }
 
-      public void RegisterStatusNotifierHost(string service) throws DBusError, IOError {
-        /*
-        NOTE:
-        usually the watcher should keep track of registered host
-        but some tray applications do net register their trayitem properly
-        when hosts register/deregister. This is fixed by setting isHostRegistered
-        always to true, this also make host handling logic unneccessary.
-       */
-      }
+    public void RegisterStatusNotifierHost(string service) throws DBusError, IOError {
+        /* NOTE:
+            usually the watcher should keep track of registered host
+            but some tray applications do net register their trayitem properly
+            when hosts register/deregister. This is fixed by setting isHostRegistered
+            always to true, this also make host handling logic unneccessary.
+         */
     }
 }
+}