Merge lp:~julien-spautz/cable/new-folder-layout into lp:cable

[Julien Spautz]

Creating a new folder layout due to the architectural changes. Additionally some namespaces will be changed accordingly.

[lp:~julien-spautz/cable/new-folder-layout]

151. By Julien Spautz on 2013-09-29

Put Irc implementation into Adapter namespace

152. By Julien Spautz on 2013-09-29

Put GUI implementation into Adapter namespace

[Julien Spautz (julien-spautz)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-28 12:37:00 +0000
+++ CMakeLists.txt	2013-09-29 09:56:16 +0000
@@ -51,54 +51,52 @@
 
     src/Cable.vala
 
-    src/Utils/Utils.vala
-    src/Utils/AutoScrolled.vala
-    src/Utils/EmbeddedAlert.vala
-    src/Utils/Identity.vala
-    src/Utils/Network.vala
-    src/Utils/MessageHistory.vala
-    src/Utils/UpMarker.vala
-    src/Utils/UrlUpMarker.vala
-    src/Utils/ColorCodeParser.vala
-
-    src/Irc/Maki.vala
-    src/Irc/Session.vala
-    src/Irc/Server.vala
-    src/Irc/Channel.vala
-
-    src/Controller/Window.vala
-    src/Controller/Server.vala
-    src/Controller/Channel.vala
-    src/Controller/PrivateChat.vala
-
-    src/View/Server.vala
-    src/View/Channel.vala
-    src/View/Window.vala
-
-    src/Settings/Settings.vala
-    src/Settings/Preferences.vala
-    src/Settings/SavedState.vala
-
-    src/Services/Launcher.vala
-    src/Services/Notify.vala
-    src/Services/Logger.vala
-
-    src/Widgets/Window.vala
-    src/Widgets/Welcome.vala
-    src/Widgets/Server.vala
-    src/Widgets/Channel.vala
-    src/Widgets/Room.vala
-    src/Widgets/ChatDisplay.vala
-    src/Widgets/User.vala
-    src/Widgets/UserList.vala
-    src/Widgets/TopicBar.vala
-
     src/Dialogs/JoinChannel.vala
-    src/Dialogs/Preferences.vala
     src/Dialogs/ManageIdentity.vala
     src/Dialogs/ManageNetwork.vala
+    src/Dialogs/Preferences.vala
+
+    src/Utils/AutoScrolled.vala
+    src/Utils/ColorCodeParser.vala
+    src/Utils/EmbeddedAlert.vala
+    src/Utils/HostMask.vala
+    src/Utils/Identity.vala
+    src/Utils/MessageHistory.vala
+    src/Utils/Network.vala
+    src/Utils/UpMarker.vala
+    src/Utils/UrlUpMarker.vala
+    src/Utils/Utils.vala
 
     src/Ports/Irc.vala
+    src/Ports/View.vala
+
+    src/Adapters/Widgets/ChatDisplay.vala
+    src/Adapters/Widgets/Room.vala
+    src/Adapters/Widgets/TopicBar.vala
+    src/Adapters/Widgets/User.vala
+    src/Adapters/Widgets/UserList.vala
+    src/Adapters/Widgets/Welcome.vala
+    src/Adapters/Widgets/Channel.vala
+    src/Adapters/Widgets/Window.vala
+    src/Adapters/Widgets/Server.vala
+
+    src/Adapters/Settings/Preferences.vala
+    src/Adapters/Settings/SavedState.vala
+    src/Adapters/Settings/Settings.vala
+
+    src/Adapters/Irc/Maki.vala
+    src/Adapters/Irc/Channel.vala
+    src/Adapters/Irc/Server.vala
+    src/Adapters/Irc/Session.vala
+
+    src/Adapters/Services/Launcher.vala
+    src/Adapters/Services/Logger.vala
+    src/Adapters/Services/Notify.vala
+
+    src/Controllers/Channel.vala
+    src/Controllers/PrivateChat.vala
+    src/Controllers/Server.vala
+    src/Controllers/Window.vala
     
     ${CMAKE_BINARY_DIR}/src/Config.vala
 PACKAGES

=== added directory 'src/Adapters'
=== added directory 'src/Adapters/Irc'
=== added file 'src/Adapters/Irc/Channel.vala'
--- src/Adapters/Irc/Channel.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Irc/Channel.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,279 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Adapter.Irc.Channel : GLib.Object, Port.Irc.Channel {
+
+    public string server_name { get; private set; }
+
+    public string name { get; set; }
+
+    string _topic = "";
+    public string topic {
+        get {
+            try {
+                _topic = client.channel_topic (server_name, this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _topic;
+        }
+    }
+
+    string[] _nicks = {};
+    public string[] nicks {
+        get {
+            try {
+                client.channel_nicks (server_name, this.name, out _nicks, out _prefixes);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _nicks;
+        }
+    }
+
+    string[] _prefixes = {};
+    public string[] prefixes {
+        get {
+            try {
+                client.channel_nicks (server_name, this.name, out _nicks, out _prefixes);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _prefixes;
+        }
+    }
+
+    public bool joined {
+        get {
+            try {
+                return name in client.channels (server_name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return false;
+        }
+    }
+
+    public Channel (string channel_name, string server_name) {
+        this.name = channel_name;
+        this.server_name = server_name;
+        setup_signals ();
+    }
+
+    /**
+     * Send a message displayed in "third person"
+     * @param message The message to be sent.
+     */
+    public void send_action (string message) {
+        try {
+            client.action (server_name, name, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Invite a person to join this channel.
+     * @param who Nick name of the person to invite.
+     */
+    public void send_invite (string who) {
+        try {
+            client.invite (server_name, name, who);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Join this channel.
+     * @param key Password to this channel. Should be "" if there is no password.
+     */
+    public void send_join (string key = "") {
+        try {
+            client.join (server_name, name, key);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Kick a user from the channel. Requires operator privileges.
+     * @param who Nick name of the user to be kicked.
+     * @param message Reason why the user has been kicked.
+     */
+    public void send_kick (string who, string message) {
+        try {
+            client.kick (server_name, name, who, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Request topic and number of users for this channel TODO move somewhere else
+     */
+    public void send_list () {
+        try {
+            client.list (server_name, name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a normal message in this channel.
+     * @param message The message.
+     */
+    public void send_message (string message) {
+        try {
+            client.message (server_name, name, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Request a list of names from the channel.
+     */
+    public void send_names () {
+        try {
+            client.names (server_name, name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Leave this channel.
+     * @param message Part message to be displayed. If null it will be fetched from the identity.
+     */
+    public void send_part (string? message = null) {
+        try {
+            client.part (server_name, name, message ?? "");
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Change or request the channel's topic.
+     * @param topic The new topic, or "" if you just want to query the current topic.
+     */
+    public void send_topic (string topic = "") {
+        try {
+            client.topic (server_name, name, topic);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Get the channel mode for a given user.
+     * @param nick Nick name of the user.
+     */
+    public string user_channel_mode (string nick) {
+        try {
+            return client.user_channel_mode (server_name, name, nick);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+        
+        return "";
+    }
+
+    /**
+     * Get the channel prefix ("@", "+") of a given user.
+     * @param nick Nick name of the user.
+     */
+    public string user_channel_prefix (string nick) {
+        try {
+            return client.user_channel_prefix (server_name, name, nick);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+        
+        return "";
+    }
+    
+    void setup_signals () {
+        client.event_action.connect ((time, server, from, target, message) => {
+            if (server == this.server_name && name == target)
+                event_action (from, message);
+        });
+        
+        client.event_banlist.connect ((time, server, channel, mask, who, when) => {
+            if (server == this.server_name && name == channel)
+                event_banlist (mask, who, when);
+        });
+
+        client.event_cannot_join.connect ((time, server, channel, reason) => {
+            if (server == this.server_name && name == channel)
+                event_cannot_join (reason);
+        });
+
+        client.event_invite.connect ((time, server, from, channel, who) => {
+            if (server == this.server_name && name == channel)
+                event_invite (from, who);
+        });
+
+        client.event_join.connect ((time, server, from, channel) => {
+            if (server == this.server_name && name == channel)
+                event_join (from);
+        });
+
+        client.event_kick.connect ((time, server, from, channel, who, message) => {
+            if (server == this.server_name && name == channel)
+                event_kick (from, who, message);
+        });
+
+        client.event_list.connect ((time, server, channel, users, topic) => {
+            if (server == this.server_name && name == channel)
+                event_list (users, topic);
+        });
+        
+        client.event_message.connect ((time, server, from, target, message) => {
+            if (server == this.server_name && name == target)
+                event_message (from, message);
+        });
+
+        client.event_names.connect ((time, server, channel, nicks, prefixes) => {
+            if (server == this.server_name && name == channel)
+                event_names (nicks, prefixes);
+        });
+
+        client.event_no_such.connect ((time, server, target, type) => {
+            if (server == this.server_name && name == target && type == "c")
+                event_no_such ();
+        });
+
+        client.event_part.connect ((time, server, from, channel, message) => {
+            if (server == this.server_name && name == channel)
+                event_part (from, message);
+        });
+
+        client.event_topic.connect ((time, server, from, channel, topic) => {
+            if (server == this.server_name && name == channel)
+                event_topic (from, topic);
+        });
+    }
+}

=== added file 'src/Adapters/Irc/Maki.vala'
--- src/Adapters/Irc/Maki.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Irc/Maki.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,278 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * This is a dbus interface to the maki daemon from the SushiIRC project.
+ * Use the methods to send requests or messages to the server and the
+ * signals to react to the server's replies.
+ */
+[DBus (name = "de.ikkoku.sushi", timeout = 120000)]
+public interface Cable.Adapter.Irc.Maki : GLib.Object {
+
+    [DBus (name = "action")]
+    public abstract void action (string server, string channel, string message) throws GLib.IOError;
+
+    [DBus (name = "away")]
+    public abstract void away (string server, string message) throws GLib.IOError;
+
+    [DBus (name = "back")]
+    public abstract void back (string server) throws GLib.IOError;
+
+    [DBus (name = "channel_nicks")]
+    public abstract void channel_nicks (string server, string channel, out string[] nicks, out string[] prefixes) throws GLib.IOError;
+
+    [DBus (name = "channel_topic")]
+    public abstract string channel_topic (string server, string channel) throws GLib.IOError;
+
+    [DBus (name = "channels")]
+    public abstract string[] channels (string server) throws GLib.IOError;
+
+    [DBus (name = "config_get")]
+    public abstract string config_get (string group, string key) throws GLib.IOError;
+
+    [DBus (name = "config_set")]
+    public abstract void config_set (string group, string key, string value) throws GLib.IOError;
+
+    // connect to a server known to maki
+    [DBus (name = "connect")]
+    public abstract void connect (string server) throws GLib.IOError;
+
+    [DBus (name = "ctcp")]
+    public abstract void ctcp (string server, string target, string message) throws GLib.IOError;
+
+    [DBus (name = "dcc_send")]
+    public abstract void dcc_send(string server, string target, string path) throws GLib.IOError;
+
+    [DBus (name = "dcc_sends")]
+    public abstract void dcc_sends (out uint64[] ids, out string[] servers, out string[] froms, out string[] filenames, out uint64[] sizes, out uint64[] progresses, out uint64[] speeds, out uint64[] statuses) throws GLib.IOError;
+
+    [DBus (name = "dcc_send_accept")]
+    public abstract void dcc_send_accept (uint64 id) throws GLib.IOError;
+
+    [DBus (name = "dcc_send_get")]
+    public abstract string dcc_send_get (uint64 id, string key) throws GLib.IOError;
+
+    [DBus (name = "dcc_send_remove")]
+    public abstract void dcc_send_remove (uint64 id) throws GLib.IOError;
+
+    [DBus (name = "dcc_send_resume")]
+    public abstract void dcc_send_resume (uint64 id) throws GLib.IOError;
+
+    [DBus (name = "dcc_send_set")]
+    public abstract void dcc_send_set (uint64 id, string key, string value) throws GLib.IOError;
+
+    [DBus (name = "ignore")]
+    public abstract void ignore (string server, string pattern) throws GLib.IOError;
+
+    [DBus (name = "ignores")]
+    public abstract string[] ignores (string server) throws GLib.IOError;
+
+    [DBus (name = "invite")]
+    public abstract void invite (string server, string channel, string who) throws GLib.IOError;
+
+    [DBus (name = "join")]
+    public abstract void join (string server, string channel, string key) throws GLib.IOError;
+
+    [DBus (name = "kick")]
+    public abstract void kick (string server, string channel, string who, string message) throws GLib.IOError;
+
+    [DBus (name = "list")]
+    public abstract void list (string server, string channel) throws GLib.IOError;
+
+    [DBus (name = "log")]
+    public abstract string[] log (string server, string target, uint64 lines) throws GLib.IOError;
+
+    [DBus (name = "message")]
+    public abstract void message (string server, string target, string message) throws GLib.IOError;
+
+    [DBus (name = "mode")]
+    public abstract void mode (string server, string target, string mode) throws GLib.IOError;
+
+    [DBus (name = "names")]
+    public abstract void names (string server, string channel) throws GLib.IOError;
+
+    [DBus (name = "nick")]
+    public abstract void nick (string server, string nick) throws GLib.IOError;
+
+    [DBus (name = "nickserv")]
+    public abstract void nickserv (string server) throws GLib.IOError;
+
+    [DBus (name = "notice")]
+    public abstract void notice (string server, string target, string message) throws GLib.IOError;
+
+    [DBus (name = "oper")]
+    public abstract void oper (string server, string name, string password) throws GLib.IOError;
+
+    [DBus (name = "part")]
+    public abstract void part (string server, string channel, string message) throws GLib.IOError;
+
+    [DBus (name = "quit")]
+    public abstract void quit (string server, string message) throws GLib.IOError;
+
+    [DBus (name = "raw")]
+    public abstract void raw (string server, string command) throws GLib.IOError;
+
+    [DBus (name = "server_get")]
+    public abstract string server_get (string server, string group, string key) throws GLib.IOError;
+
+    [DBus (name = "server_get_list")]
+    public abstract string[] server_get_list (string server, string group, string key) throws GLib.IOError;
+
+    // server_list ("", "") gives a list of servers known to maki
+    [DBus (name = "server_list")]
+    public abstract string[] server_list (string server, string group) throws GLib.IOError;
+
+    [DBus (name = "server_remove")]
+    public abstract void server_remove (string server, string group, string key) throws GLib.IOError;
+
+    [DBus (name = "server_rename")]
+    public abstract void server_rename (string old, string new_) throws GLib.IOError;
+
+    [DBus (name = "server_set")]
+    public abstract void server_set (string server, string group, string key, string value) throws GLib.IOError;
+
+    [DBus (name = "server_set_list")]
+    public abstract void server_set_list (string server, string group, string key, string[] list) throws GLib.IOError;
+
+    [DBus (name = "servers")]
+    public abstract string[] servers () throws GLib.IOError;
+
+    [DBus (name = "shutdown")]
+    public abstract void shutdown (string message) throws GLib.IOError;
+
+    [DBus (name = "support_chantypes")]
+    public abstract string support_chantypes (string server) throws GLib.IOError;
+
+    [DBus (name = "support_prefix")]
+    public abstract string[] support_prefix (string server) throws GLib.IOError;
+
+    [DBus (name = "topic")]
+    public abstract void topic (string server, string channel, string topic) throws GLib.IOError;
+
+    [DBus (name = "unignore")]
+    public abstract void unignore (string server, string pattern) throws GLib.IOError;
+
+    [DBus (name = "user_away")]
+    public abstract bool user_away (string server, string nick) throws GLib.IOError;
+
+    [DBus (name = "user_channel_mode")]
+    public abstract string user_channel_mode (string server, string channel, string nick) throws GLib.IOError;
+
+    [DBus (name = "user_channel_prefix")]
+    public abstract string user_channel_prefix (string server, string channel, string nick) throws GLib.IOError;
+
+    [DBus (name = "user_from")]
+    public abstract string user_from (string server, string nick) throws GLib.IOError;
+
+    [DBus (name = "version")]
+    public abstract uint64[] version () throws GLib.IOError;
+
+    [DBus (name = "who")]
+    public abstract void who (string server, string mask, bool operators_only) throws GLib.IOError;
+
+    [DBus (name = "whois")]
+    public abstract void whois (string server, string mask) throws GLib.IOError;
+
+    [DBus (name = "action")]
+    public signal void event_action (int64 time, string server, string from, string target, string message);
+
+    [DBus (name = "away")]
+    public signal void event_away (int64 time, string server);
+
+    [DBus (name = "away_message")]
+    public signal void event_away_message (int64 time, string server, string nick, string message);
+
+    [DBus (name = "back")]
+    public signal void event_back (int64 time, string server);
+
+    [DBus (name = "banlist")]
+    public signal void event_banlist (int64 time, string server, string channel, string mask, string who, int64 when);
+
+    [DBus (name = "cannot_join")]
+    public signal void event_cannot_join (int64 time, string server, string channel, string reason);
+
+    [DBus (name = "connect")]
+    public signal void event_connect (int64 time, string server);
+
+    [DBus (name = "connected")]
+    public signal void event_connected (int64 time, string server);
+
+    [DBus (name = "ctcp")]
+    public signal void event_ctcp (int64 time, string server, string from, string target, string message);
+
+    [DBus (name = "dcc_send")]
+    public signal void event_dcc_send (int64 time, string server, uint64 id, string from, string filename, uint64 size, uint64 progress, uint64 speed, uint64 status);
+
+    [DBus (name = "error")]
+    public signal void event_error (int64 time, string server, string domain, string reason, string[] arguments);
+
+    [DBus (name = "invite")]
+    public signal void event_invite (int64 time, string server, string from, string channel, string who);
+
+    [DBus (name = "join")]
+    public signal void event_join (int64 time, string server, string from, string channel);
+
+    [DBus (name = "kick")]
+    public signal void event_kick (int64 time, string server, string from, string channel, string who, string message);
+
+    [DBus (name = "list")]
+    public signal void event_list (int64 time, string server, string channel, int64 users, string topic);
+
+    [DBus (name = "message")]
+    public signal void event_message (int64 time, string server, string from, string target, string message);
+
+    [DBus (name = "mode")]
+    public signal void event_mode (int64 time, string server, string from, string target, string mode, string parameter);
+
+    [DBus (name = "motd")]
+    public signal void event_motd (int64 time, string server, string message);
+
+    [DBus (name = "names")]
+    public signal void event_names (int64 time, string server, string channel, string[] nicks, string[] prefixes);
+
+    [DBus (name = "nick")]
+    public signal void event_nick (int64 time, string server, string from, string new_nick);
+
+    [DBus (name = "no_such")]
+    public signal void event_no_such (int64 time, string server, string target, string type);
+
+    [DBus (name = "notice")]
+    public signal void event_notice (int64 time, string server, string from, string target, string message);
+
+    [DBus (name = "oper")]
+    public signal void event_oper (int64 time, string server);
+
+    [DBus (name = "part")]
+    public signal void event_part (int64 time, string server, string from, string channel, string message);
+
+    [DBus (name = "quit")]
+    public signal void event_quit (int64 time, string server, string from, string message);
+
+    [DBus (name = "shutdown")]
+    public signal void event_shutdown (int64 time);
+
+    [DBus (name = "topic")]
+    public signal void event_topic (int64 time, string server, string from, string channel, string topic);
+
+    [DBus (name = "user_away")]
+    public signal void event_user_away (int64 time, string server, string from, bool away);
+
+    [DBus (name = "whois")]
+    public signal void event_whois (int64 time, string server, string nick, string message);
+}

=== added file 'src/Adapters/Irc/Server.vala'
--- src/Adapters/Irc/Server.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Irc/Server.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,621 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Cable.Irc.ServerConfig is a class that allows you to change the configuration of a server.
+ * This configuration is a normal keyfile. Possible keys are:
+ *
+ *  autoconnect (should always be true)
+ *  port (default, maki takes care of this)
+ *  ssl (-> network)
+ *  nick (-> identity)
+ *  user (automatic)
+ *  name (-> identity)
+ *  address (-> network)
+ *  nickserv (-> server, I guess...)
+ */
+private class Cable.Adapter.Irc.ServerConfig : GLib.Object {
+
+    // The server's name. Used by maki.
+    public string name { get; set; }
+
+    public ServerConfig (string name) {
+        Object (name: name);
+    }
+
+    public new string @get (string key) {
+        string result = "";
+
+        try {
+            result = client.server_get (this.name, "server", key);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+
+        return result;
+    }
+
+    public new void @set (string key, string value) {
+        try {
+            client.server_set (this.name, "server", key, value);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /*public void unset (string key) {
+        try {
+            client.server_remove (this.name, "server", key);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }*/
+}
+
+public class Cable.Adapter.Irc.Server : GLib.Object, Port.Irc.Server {
+
+    public static Gee.ArrayList <Server> all { get; private set; }
+
+    public Utils.Network network {
+        owned get {
+            return Utils.Network.get_or_create (config["address"]);
+        }
+    }
+
+    public Utils.Identity identity {
+        owned get {
+            return Utils.Identity.get_or_create (config["nick"]);
+        }
+    }
+    
+    public string address {
+        owned get { return config["address"]; }
+    }
+    
+    public string nick {
+        owned get { return config["nick"]; }
+    }
+
+    private ServerConfig config;
+
+    public string name { get; set; }
+
+    public bool away {
+        get {
+            try {
+                return client.user_away (this.name, identity.nick_name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return false;
+        }
+    }
+
+    public bool connected {
+        get {
+            try {
+                return this.name in client.servers ();
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return false;
+        }
+    }
+
+    public string[] channel_names {
+        owned get {
+            try {
+                return client.channels (this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return {};
+        }
+    }
+
+    public string[] supported_prefixes {
+         owned get {
+            try {
+                return client.support_prefix (this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return {};
+        }
+    }
+
+    public string supported_channel_types {
+         owned get {
+            try {
+                return client.support_chantypes (this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return "";
+        }
+    }
+
+    public string[] ignores {
+         owned get {
+            try {
+                return client.ignores (this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            return {};
+        }
+    }
+    
+    string[] server_names {
+        owned get {
+            try {
+                return client.servers ();
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+
+            return {};
+        }
+    }
+
+    string[] known_server_names {
+        owned get {
+            try {
+                return client.server_list ("", "");
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+
+            return {};
+        }
+    }
+
+    /* TODO put in channel as property and use unlimited lines:
+    public string[] log (string target, uint64 lines) throws GLib.IOError {
+        return client.log (this.name, target, lines);
+    }*/
+
+    /**
+     * A server is uniquely identified by a combination of a network and an identity.
+     */
+    public Server (string address, string nick) {
+    debug (@"+ IRC SERVER $address");
+        setup_signals ();
+
+        foreach (var server in server_names) {
+            var config = new ServerConfig (server);
+            if (config["nick"] == nick &&
+                config["address"] == address &&
+                config["client"] == "cable") {
+                name = server;
+                break;
+            }
+        }
+
+        if (name != null) {
+            debug (@"Already connected to $name.");
+            config = new ServerConfig (name);
+        } else {
+            name = "cable|" + GLib.Random.next_int ().to_string ();
+
+            debug (@"Creating new server $name.");
+
+            config = new ServerConfig (name);
+
+            config["nick"] = nick;
+            config["address"] = address;
+            config["nickserv"] = network.password;
+            config["name"] = identity.real_name;
+            config["autoconnect"] = "true";
+            config["client"] = "cable";
+
+            debug ("Successfully set up server.\n");
+        }
+
+        //all.add (this);
+
+        event_nick.connect_after ((from, new_nick) => {
+            if (is_me (from))
+                config["nick"] = new_nick;
+        });
+    }
+
+    /**
+     * Creates a server from its maki name.
+     */
+    public Server.from_name (string name) {
+        
+        setup_signals ();
+        
+        this.name = name;
+
+        config = new ServerConfig (name);
+
+    debug (@"+ IRC SERVER $address (from_name)");
+    
+        //all.add (this);
+
+        event_nick.connect_after ((from, new_nick) => {
+            if (is_me (from))
+                config["nick"] = new_nick;
+        });
+    }
+    
+    ~Server () { debug (@"- IRC SERVER $address"); }
+
+    public Port.Irc.Channel get_or_create_channel (string channel_name) {
+        return new Channel (channel_name, this.name) as Port.Irc.Channel;
+    }
+
+    /**
+     * Check if a command was issued by me.
+     */
+    public bool is_me (string from) {
+        var nick = from.split ("!")[0];
+        return nick == identity.nick_name;
+    }
+
+    /**
+     * Pass on signals from the backend daemon without the time and server parameters.
+     */
+    void setup_signals () {
+        client.event_away.connect ((time, server) => {
+            if (server == this.name)
+                event_away ();
+        });
+
+        client.event_away_message.connect ((time, server, nick, message) => {
+            if (server == this.name)
+                event_away_message (nick, message);
+        });
+
+        client.event_back.connect ((time, server) => {
+            if (server == this.name)
+                event_back ();
+        });
+
+        client.event_connected.connect ((time, server) => {
+            if (server == this.name)
+                event_connected ();
+        });
+
+       /* client.event_ctcp.connect ((time, server, from, target, message) => {
+            if (server == this.name)
+                event_ctcp (from, target, message);
+        });
+
+        client.event_dcc_send.connect ((time, server, id, from, filename, size, progress, speed, status) => {
+            if (server == this.name)
+                event_dcc_send (id, from, filename, size, progress, speed, status);
+        });*/
+
+        client.event_error.connect ((time, server, domain, reason, arguments) => {
+            if (server == this.name)
+                event_error (domain, reason, arguments);
+        });
+
+        client.event_invite.connect ((time, server, from, channel, who) => {
+            if (server == this.name)
+                event_invite (from, channel, who);
+        });
+
+        client.event_list.connect ((time, server, channel, users, topic) => {
+            if (server == this.name)
+                event_list (channel, users, topic);
+        });
+
+        client.event_message.connect ((time, server, from, target, message) => {
+            if (server == this.name)
+                event_message (from, target, message);
+        });
+
+        client.event_mode.connect ((time, server, from, target, mode, parameter) => {
+            if (server == this.name)
+                event_mode (from, target, mode, parameter);
+        });
+
+        client.event_motd.connect ((time, server, message) => {
+            if (server == this.name)
+                event_motd (message);
+        });
+
+        client.event_nick.connect ((time, server, from, new_nick) => {
+            if (server == this.name)
+                event_nick (from, new_nick);
+        });
+
+        client.event_no_such.connect ((time, server, target, type) => {
+            if (server == this.name)
+                event_no_such (target, type);
+        });
+
+        client.event_notice.connect ((time, server, from, target, message) => {
+            if (server == this.name)
+                event_notice (from, target, message);
+        });
+
+        client.event_oper.connect ((time, server) => {
+            if (server == this.name)
+                event_oper ();
+        });
+
+        client.event_quit.connect ((time, server, from, message) => {
+            if (server == this.name)
+                event_quit (from, message);
+        });
+
+        client.event_user_away.connect ((time, server, from, away) => {
+            if (server == this.name)
+                event_user_away (from, away);
+        });
+
+        client.event_whois.connect ((time, server, nick, message) => {
+            if (server == this.name)
+                event_whois (nick, message);
+        });
+    }
+
+    /**
+     * Set your status to "away" and leave a message.
+     * @param message Message displayed to users trying to talk to you.
+     */
+    public void send_away (string? message = null) {
+        try {
+            client.away (this.name, message ?? identity.away_message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Unsets "away" status.
+     */
+    public void send_back () {
+        try {
+            client.back (this.name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Connect to this server.
+     */
+    public new void send_connect () {
+        try {
+            client.connect (this.name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /*public void ctcp (string target, string message) throws GLib.IOError {
+        client.ctcp (this.name, target, message);
+    }
+
+    public void dcc_send (string target, string path) throws GLib.IOError {
+        client.action (this.name, target, path);
+    }
+
+    public void dcc_sends (out uint64[] ids, out string[] servers, out string[] froms, out string[] filenames, out uint64[] sizes, out uint64[] progresses, out uint64[] speeds, out uint64[] statuses) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }
+
+    public void dcc_send_accept (uint64 id) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }
+
+    public string dcc_send_get (uint64 id, string key) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }
+
+    public void dcc_send_remove (uint64 id) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }
+
+    public void dcc_send_resume (uint64 id) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }
+
+    public void dcc_send_set (uint64 id, string key, string value) throws GLib.IOError {
+        client.action (this.name, channel, message);
+    }*/
+
+    /**
+     * Ignore messages from users who fit the given pattern.
+     * @param pattern The pattern to use.
+     */
+    public void send_ignore (string pattern) {
+        try {
+            client.ignore (this.name, pattern);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a message to a givent target.
+     * @param target can be a channel or a user.
+     * @param message Message you want to send.
+     */
+    public void send_message (string target, string message) {
+        try {
+            client.message (this.name, target, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    public void send_mode (string target, string mode) {
+        try {
+            client.mode (this.name, target, mode);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a NICK request to change your current nick on this network.
+     * @param nick Your new nick name.
+     */
+    public void send_nick (string nick) {
+        try {
+            client.nick (this.name, nick);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Identify with nickserv.
+     */
+    public void send_nickserv () {
+        try {
+            client.nickserv (this.name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a NOTICE.
+     * @param target Can be a TODO ??
+     * @param message The message you want to send.
+     */
+    public void send_notice (string target, string message) {
+        try {
+            client.notice (this.name, target, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send OPER request.
+     * @param name TODO
+     * @param password OP password.
+     */
+    public void send_oper (string name, string password) {
+        try {
+            client.oper (this.name, name, password);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+    
+    public void send_part (string channel, string? message = null) {
+        try {
+            client.part (this.name, channel, message ?? identity.part_message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Disconnect from the server and all channels.
+     * @param message Message displayed to other users.
+     */
+    public void send_quit (string? message = null) {
+        try {
+            client.quit (this.name, message ?? identity.quit_message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a raw IRC command.
+     * @param command The raw command you want to send.
+     */
+    public void send_raw (string command) {
+        try {
+            client.raw (this.name, command);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Remove a certain pattern from the ignored list.
+     * @param pattern The pattern.
+     */
+    public void send_unignore (string pattern) {
+        try {
+            client.unignore (this.name, pattern);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * TODO
+     */
+    public void send_who (string mask, bool operators_only) {
+        try {
+            client.who (this.name, mask, operators_only);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * TODO
+     */
+    public void send_whois (string mask) {
+        try {
+            client.whois (this.name, mask);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /*public string server_get (string group, string key) throws GLib.IOError {
+        return client.server_get (this.name, group, key);
+    }
+
+    public string[] server_get_list (string group, string key) throws GLib.IOError {
+        return client.server_get_list (this.name, group, key);
+    }
+
+    public string[] server_list (string group) throws GLib.IOError {
+        return client.server_list (this.name, group);
+    }
+
+    public void server_remove (string group, string key) throws GLib.IOError {
+        client.server_remove (this.name, group, key);
+    }
+
+    public void server_rename (string new_name) throws GLib.IOError {
+        client.server_rename (this.name, new_name);
+    }
+
+    public void server_set (string group, string key, string value) throws GLib.IOError {
+        client.server_set (this.name, group, key, value);
+    }
+
+    public void server_set_list (string group, string key, string[] list) throws GLib.IOError {
+        client.server_set_list (this.name, group, key, list);
+    }*/
+}

=== added file 'src/Adapters/Irc/Session.vala'
--- src/Adapters/Irc/Session.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Irc/Session.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,77 @@
+namespace Cable.Adapter.Irc {
+    Maki client;
+}
+
+class Cable.Adapter.Irc.Session : Object, Port.Irc.Session {
+
+    Gee.List <Server> servers;
+
+    string[] server_names {
+        owned get {
+            try {
+                return client.servers ();
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+
+            return {};
+        }
+    }
+
+    string[] known_server_names {
+        owned get {
+            try {
+                return client.server_list ("", "");
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+
+            return {};
+        }
+    }
+    
+    public Session () {
+        init ();
+    }
+
+    public void init () {
+        if (client == null) {
+            try {
+                client = Bus.get_proxy_sync (GLib.BusType.SESSION, "de.ikkoku.sushi", "/de/ikkoku/sushi");
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+
+            debug ("Successfully connected to Sushi dbus session.\n");
+        }
+
+        servers = new Gee.ArrayList <Server> ();
+
+        // TODO do something more intelligent here
+        foreach (var server_name in known_server_names) {
+            var server = new Server.from_name (server_name);
+            foreach (var channel in server.channel_names)
+                server.send_part (channel);
+            servers.add (server);
+        }
+        
+    }
+
+    public Port.Irc.Server get_or_create_server (string address, string nick) {
+        return (get_server (address, nick) ??
+               create_server (address, nick)) as Port.Irc.Server;
+    }
+
+    Server? get_server (string address, string nick) {
+        foreach (var server in servers)
+            if (server.address == address && server.nick == nick)
+                return server as Server;
+        return (Server) null;
+    }
+
+    Server create_server (string address, string nick) {
+        var server = new Server (address, nick);
+        servers.add (server);
+        return server;
+    }
+}

=== added directory 'src/Adapters/Services'
=== added file 'src/Adapters/Services/Launcher.vala'
--- src/Adapters/Services/Launcher.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Services/Launcher.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,66 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Static class for managing the launcher using libunity.
+ */
+public class Cable.Services.Launcher {
+
+    static Unity.LauncherEntry launcher_entry;
+
+    /**
+     * Number shown in the badge on the launcher.
+     * If the value is zero, the badge will be hidden automatically.
+     */
+    public static int64 jobs {
+        get { return launcher_entry.count; }
+        set {
+            assert (value >= 0);
+            launcher_entry.count = value;
+            launcher_entry.count_visible = value > 0;
+        }
+    }
+
+    /**
+     * Progress shown on the launcher. Will be hidden when complete.
+     */
+    public static double progress {
+        get { return launcher_entry.progress; }
+        set {
+            assert (0.0 <= value <= 1.0);
+            launcher_entry.progress = value;
+            launcher_entry.progress_visible = value < 1.0;
+        }
+    }
+    
+    /**
+     * Set launcher to urgent.
+     */
+    public static bool urgent {
+        get { return launcher_entry.urgent; }
+        set { launcher_entry.urgent = value; }
+    }
+
+    /**
+     * Must be called before anything else.
+     */
+    public static void init () {
+        launcher_entry = Unity.LauncherEntry.get_for_desktop_id ("cable.desktop");
+    }
+}

=== added file 'src/Adapters/Services/Logger.vala'
--- src/Adapters/Services/Logger.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Services/Logger.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,7 @@
+class Cable.Services.Logger {
+
+    public static void init () {
+        Granite.Services.Logger.initialize ("Cable");
+        Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+    }
+}
\ No newline at end of file

=== added file 'src/Adapters/Services/Notify.vala'
--- src/Adapters/Services/Notify.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Services/Notify.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,42 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Static class to deal with notifications.
+ */
+public class Cable.Services.Notify : GLib.Object {
+
+    public static void init () {
+        if (global::Notify.is_initted ()) {
+            warning ("Trying to reinitialize Notify.");
+            return;
+        }
+
+        global::Notify.init ("Cable");
+    }
+
+    public static void send (string summary, string body) {
+        var notify = new global::Notify.Notification (summary, body, "internet-chat");
+        try {
+            notify.show ();
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+}

=== added directory 'src/Adapters/Settings'
=== added file 'src/Adapters/Settings/Preferences.vala'
--- src/Adapters/Settings/Preferences.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Settings/Preferences.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,58 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Settings.Preferences : Granite.Services.Settings {
+
+    public string[] networks { get; set; }
+    public string[] identities { get; set; }
+    public string[] channels { get; set; }
+    public string last_used_nick { get; set; }
+
+    public Preferences () {
+        base ("org.pantheon.cable");
+    }
+    /*public override void verify (string key) {
+        switch (key) {
+
+            case "networks":
+                string[] new_value = {};
+
+                foreach (var network in networks)
+                    if (network.split (":").length == 3)
+                        new_value += network;
+
+                if (networks != new_value)
+                    networks = new_value;
+
+                break;
+
+            case "identities":
+                string[] new_value = {};
+
+                foreach (var identity in identities)
+                    if (identity.split (":").length == 3)
+                        new_value += identity;
+
+                if (identities != new_value)
+                    identities = new_value;
+
+                break;
+        }
+    }*/
+}

=== added file 'src/Adapters/Settings/SavedState.vala'
--- src/Adapters/Settings/SavedState.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Settings/SavedState.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,36 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Settings.SavedState : Granite.Services.Settings {
+
+    public int window_width { get; set; }
+    public int window_height { get; set; }
+    public WindowState window_state { get; set; }
+
+    public int column_server_width { get; set; }
+
+    public SavedState () {
+        base ("org.pantheon.cable.saved-state");
+    }
+
+    public enum WindowState {
+        NORMAL,
+        MAXIMIZED
+    }
+}

=== added file 'src/Adapters/Settings/Settings.vala'
--- src/Adapters/Settings/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Settings/Settings.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,35 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Namespace for accessing the app's gsettings. May be used by any part of the app.
+ */
+namespace Cable.Settings {
+
+    public static Settings.Preferences preferences;
+    public static Settings.SavedState saved_state;
+
+    /**
+     * Load values from gsettings.
+     */
+    public static void init () {
+        preferences = new Settings.Preferences ();
+        saved_state = new Settings.SavedState ();
+    }
+}

=== added directory 'src/Adapters/Widgets'
=== added file 'src/Adapters/Widgets/Channel.vala'
--- src/Adapters/Widgets/Channel.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/Channel.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,131 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+namespace Cable.Adapter.Widgets {
+
+    public class Chat : Granite.Widgets.SourceList.Item {
+
+        public Room room;
+
+        public string nick { get; set; }
+        public string id { get; set; }
+        public string entry { get; set; }
+
+        public int unread_messages {
+            get { return int.parse (badge); }
+            set { badge = (value <= 0) ? "" : value.to_string (); }
+        }
+
+        public bool has_focus {
+            get { return room.text_entry.has_focus; }
+        }
+
+        public void rename_user (string? old_name, string new_name, UserType type, bool silent = false) {
+            room.rename_user (old_name, new_name, type, silent);
+        }
+
+        public void set_away_status (string nick, bool away) {
+            room.chat.message_away (nick, away);
+        }
+
+        public void message (owned string from, string message, MessageType type = MessageType.NORMAL) {
+            room.chat.add_message (from, message, type);
+        }
+    }
+
+    public class PrivateChat : Widgets.Chat, Port.View.Chat, Port.View.PrivateChat {
+    
+        public PrivateChat (string name, string id) {
+            GLib.Object (name: name, id: id);
+            this.room = new Room (name);
+            
+            room.send_message.connect ((msg) => send_message (msg));
+            room.text_entry.grab_focus.connect (() => { focused (); });
+            
+            // bind properties
+            bind_property ("nick", room, "nick", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("name", room, "name", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("entry", room, "entry", GLib.BindingFlags.BIDIRECTIONAL);
+        }
+    }
+
+    public class Channel : Widgets.Chat, Port.View.Chat, Port.View.Channel {
+
+        Gtk.Menu menu;
+        Gtk.MenuItem leave_menu_item;
+
+        public State state { get; set; }
+        public string topic { get; set; }
+
+        public Channel (string name, string id) {
+            GLib.Object (name: name, id: id);
+            this.room = new Room (name);
+
+            this.menu = new Gtk.Menu ();
+            this.leave_menu_item = new Gtk.MenuItem.with_label (_("Leave Channel"));
+            menu.append (leave_menu_item);
+            menu.show_all ();
+
+            // setup signals
+            leave_menu_item.activate.connect (()
+                => part ());
+                
+            room.send_message.connect ((msg)
+                => send_message (msg));
+                
+            room.rejoin.connect (()
+                => join ());
+                
+            room.text_entry.grab_focus.connect (()
+                => { focused (); });
+            
+            room.user_list.private_chat_requested.connect ((name)
+                => private_chat_requested (name));
+
+            // bind properties
+            bind_property ("state", room, "state", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("nick", room, "nick", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("name", room, "name", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("topic", room.topic_bar, "topic", GLib.BindingFlags.BIDIRECTIONAL);
+            bind_property ("entry", room, "entry", GLib.BindingFlags.BIDIRECTIONAL);
+        }
+
+        public override Gtk.Menu? get_context_menu () {
+            if (menu != null && menu.get_attach_widget () != null)
+                menu.detach ();
+            return menu;
+        }
+
+        public bool has_user (string nick) {
+            return room.has_user (nick);
+        }
+
+        public void list_users (string[] nicks, string[] prefixes) {
+            room.list_users (nicks, prefixes);
+        }
+
+        public void add_user (string name, UserType type, bool silent = false) {
+            room.add_user (name, type, silent);
+        }
+
+        public void remove_user (string name, string message, bool silent = false) {
+            room.remove_user (name, message, silent);
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Adapters/Widgets/ChatDisplay.vala'
--- src/Adapters/Widgets/ChatDisplay.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/ChatDisplay.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,153 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public enum Cable.MessageType {
+    NORMAL,
+    ENTER,
+    LEAVE,
+    SUGGESTION,
+    NICK,
+    AWAY,
+    PING,
+    ACTION;
+    /* QUIT, KICK, BAN, MODE(?), ACTION
+    */
+    
+    public string color () {
+        switch (this) {
+            case NORMAL:
+            case ACTION:
+                return "#333";
+            case ENTER:
+                return "#9a9";
+            case LEAVE:
+                return "#a99";
+            case SUGGESTION:
+            case NICK:
+            case AWAY:
+                return "#999";
+            case PING:
+                return "#da4d45";
+        }
+        
+        return "";
+    }
+}
+
+public class Cable.Adapter.Widgets.ChatDisplay : Gtk.EventBox {
+
+    private Gtk.Grid main_grid;
+    private int line = 0;
+
+    public ChatDisplay () {
+        this.get_style_context ().add_class (Granite.StyleClass.CONTENT_VIEW);
+        main_grid = new Gtk.Grid ();
+        main_grid.margin = 12;
+        main_grid.margin_bottom = 0;
+        main_grid.column_spacing = 12;
+        main_grid.row_spacing = 6;
+        main_grid.expand = true;
+        expand = true;
+        this.add (main_grid);
+    }
+
+    public void add_message (string _user, string _message, MessageType type = MessageType.NORMAL) {
+        var message = Utils.parse_string_to_markup (_message);
+        var message_color = type.color ();
+        var nick_color = get_color_for_nick (_user);
+        var time = new DateTime.now_local ();
+        var stamp = time.format ("%T");
+        
+        message = @"<span color='$message_color'>$message</span>";
+        var user = @"<span color='$nick_color'>$_user</span>";
+    
+        var user_label = new Gtk.Label ("");
+        user_label.set_markup (user);
+        user_label.set_alignment (1, 0);
+        user_label.width_request = 80;
+        user_label.ellipsize = Pango.EllipsizeMode.END;
+        
+        var message_label = new Granite.Widgets.WrapLabel ("");
+        message_label.hexpand = true;
+        message_label.use_markup = true;
+        message_label.selectable = true;
+        message_label.set_markup (message);
+        message_label.wrap_mode = Pango.WrapMode.WORD;
+        message_label.wrap = true;
+        
+        var time_label = new Gtk.Label ("");
+        time_label.set_markup (@"<span color='#bbb'>$stamp</span>");
+        time_label.set_alignment (1, 0);
+        
+        main_grid.attach (user_label, 0, line, 1, 1);
+        main_grid.attach (message_label, 1, line, 1, 1);
+        main_grid.attach (time_label, 2, line, 1, 1);
+        
+        this.show_all ();
+        
+        line++;
+    }
+    
+    public void message_part (string nick, string message) {
+        add_message ("", @"← $nick: $message", MessageType.LEAVE);
+    }
+    
+    public void message_join (string nick) {
+        add_message ("", @"→ $nick", MessageType.ENTER);
+    }
+    
+    public void message_nick (string old_nick, string new_nick) {
+        add_message ("", @"$old_nick → $new_nick", MessageType.NICK);
+    }
+    
+    public void message_suggestions (string[] suggestions) {
+        add_message ("", string.joinv (" - ", suggestions), MessageType.SUGGESTION);
+    }
+    
+    public void message_away (string nick, bool away) {
+        add_message ("", nick + " " + _("is") + " " + (away ? _("away") : _("back")), MessageType.AWAY);
+    }
+    
+    Gee.HashMap <string, string> color_map = null;
+    int i = 0;
+    
+    string get_color_for_nick (string nick) {
+        if (color_map == null)
+            color_map = new Gee.HashMap <string, string> ();
+        
+        if (nick == "")
+            return "#000";
+        
+        string[] colors = {
+            "#990055",
+            "#669900",
+            "#ec6f00",
+            "#0077aa",
+            "#dd1144",
+            "#00a0b3",
+            "#8f0a0a"
+        };
+        
+        if (!color_map.has_key (nick)) {
+            color_map[nick] = colors[i++ % colors.length];
+        }
+        
+        return color_map[nick];
+    }
+}

=== added file 'src/Adapters/Widgets/Room.vala'
--- src/Adapters/Widgets/Room.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/Room.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,283 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public enum Cable.UserType {
+    OPERATOR,
+    VOICED,
+    REGULAR
+}
+
+public enum Cable.State {
+    CHAT,
+    JOINING,
+    NOT_JOINED,
+    NO_SUCH;
+}
+
+/**
+ * This class represents a chat room, i.e, the topic, the message display,
+ * a list of users and is associated to a channel.
+ * This class is always accessed through its related channel.
+ */
+public class Cable.Adapter.Widgets.Room : Gtk.Grid {
+
+    public UserList user_list;
+    public ChatDisplay chat;
+    public Gtk.Entry text_entry;
+    public Widgets.Topic topic_bar;
+    public Gtk.Label pseudo_label;
+    
+    Granite.Widgets.EmbeddedAlert not_joined_alert;
+    Granite.Widgets.EmbeddedAlert no_such_alert;
+    Granite.Widgets.EmbeddedAlert loading_screen;
+    Granite.Widgets.ThinPaned paned;
+
+    Utils.AutoScrolled left_scrolled;
+
+    Gtk.Action action_join;
+
+    public signal void send_message (string message);
+    // public signal void request_complete ();
+    public signal void rejoin ();
+
+    public string channel { get; set; }
+
+    public string nick {
+        get { return pseudo_label.label; }
+        set { pseudo_label.label = value; }
+    }
+
+    public string entry {
+        get { return text_entry.text; }
+        set { text_entry.text = value; }
+    }
+
+    public Utils.MessageHistory history { get; private set; }
+
+    State _state;
+    public State state {
+        get { return _state; }
+        set {
+            _state = value;
+
+            var widget = get_child_at (0, 0);
+            if (widget != null)
+                remove (widget);
+
+            switch (_state) {
+                case State.CHAT:
+                    attach (paned, 0, 0, 1, 1);
+                    break;
+                case State.JOINING:
+                    attach (loading_screen, 0, 0, 1, 1);
+                    loading_screen.working = true;
+                    break;
+                case State.NOT_JOINED:
+                    attach (not_joined_alert, 0, 0, 1, 1);
+                    break;
+                case State.NO_SUCH:
+                    attach (no_such_alert, 0, 0, 1, 1);
+                    break;
+                default:
+                    assert_not_reached ();
+            }
+
+            show_all ();
+        }
+    }
+
+    public Room (string channel, string nick = "") {
+        this.channel = channel;
+
+        history = new Utils.MessageHistory ();
+
+        init_layout ();
+        connect_callbacks ();
+    }
+
+    void init_layout () {
+        user_list = new UserList ();
+        
+        paned = new Granite.Widgets.ThinPaned ();
+        var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+        paned.pack1 (box, true, false);
+        paned.pack2 (user_list, false, false);
+
+        text_entry = new Gtk.Entry ();
+        text_entry.hexpand = true;
+
+        left_scrolled = new Utils.AutoScrolled ();
+        left_scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
+
+        chat = new ChatDisplay ();
+
+        topic_bar = new Widgets.Topic ();
+
+        pseudo_label = new Gtk.Label ("");
+        pseudo_label.set_alignment (1, (float) 0.5);
+        pseudo_label.width_request = 80;
+
+        var entry_eventbox = new Gtk.EventBox ();
+        entry_eventbox.get_style_context ().add_class (Granite.StyleClass.CONTENT_VIEW);
+        var entry_grid = new Gtk.Grid ();
+        entry_grid.margin = 12;
+        entry_grid.column_spacing = 12;
+        entry_eventbox.add (entry_grid);
+
+        entry_grid.attach (pseudo_label, 0, 0, 1, 1);
+        entry_grid.attach (text_entry, 1, 0, 1, 1);
+        left_scrolled.add_with_viewport (chat);
+
+        box.pack_start (topic_bar, false);
+        box.pack_start (left_scrolled);
+        box.pack_start (entry_eventbox, false);
+
+        loading_screen = new Granite.Widgets.EmbeddedAlert ();
+        loading_screen.primary_text = _("Joining channel %s").printf (channel);
+        loading_screen.working = true;
+
+        action_join = new Gtk.Action ("join", "Join Channel", "Join this channel", null);
+
+        not_joined_alert = new Granite.Widgets.EmbeddedAlert ();
+        not_joined_alert.primary_text = _("Channel is not joined");
+        not_joined_alert.secondary_text = _("Join the channel to receive and send messages.");
+        not_joined_alert.message_type = Gtk.MessageType.WARNING;
+        not_joined_alert.actions = {action_join};
+
+        no_such_alert = new Granite.Widgets.EmbeddedAlert ();
+        no_such_alert.primary_text = _("Cannot join channel");
+        no_such_alert.secondary_text = _("An error has occurred, this channel does not exist.");
+        no_such_alert.message_type = Gtk.MessageType.WARNING;
+        no_such_alert.show_icon=  true;
+
+        state = State.CHAT;
+
+        this.show_all ();
+    }
+
+    void connect_callbacks () {
+        text_entry.key_press_event.connect ((ev) => {
+            if (ev.keyval == Gdk.Key.Tab) {
+                var text = text_entry.text;
+
+                if (text == null || text == "")
+                    return false;
+
+                var words = text.split (" ");
+                var word =  words[words.length-1];
+
+                if (word == null || word == "")
+                    return false;
+
+                string[] completion = null;
+                foreach (var nick in user_list.nicks)
+                    if (word.down () == nick[0:word.length].down ())
+                        completion += nick;
+
+                if (completion == null)
+                    return true;
+
+                if (completion.length > 1) {
+                    chat.message_suggestions (completion);
+                    return true;
+                } else {
+                    text_entry.buffer.delete_text (text_entry.cursor_position - word.length, word.length);
+
+                    if (text_entry.text != "") {
+                        text_entry.insert_at_cursor (completion[0] + " ");
+                    } else {
+                        text_entry.insert_at_cursor (completion[0] + ": ");
+                    }
+                    return true;
+                }
+            } else if (ev.keyval == Gdk.Key.Up) {
+                if (history.has_older ())
+                    text_entry.text = history.get_older ();
+                return true;
+            } else if (ev.keyval == Gdk.Key.Down) {
+                if (history.has_newer ())
+                    text_entry.text = history.get_newer ();
+                return true;
+            }
+
+            return false;
+        });
+
+        text_entry.activate.connect (() => {
+            if (text_entry.text != "") {
+                history.append (text_entry.text);
+                send_message (text_entry.text);
+            }
+        });
+
+        action_join.activate.connect (() => {
+            rejoin (); // signal
+        });
+    }
+
+    public void list_users (string[] nicks, string[] prefixes)
+        requires (nicks.length == prefixes.length) {
+
+        for (int i = 0; i < nicks.length; i++) {
+            switch (prefixes[i]) {
+                case "@":
+                    user_list.add_user (nicks[i], UserType.OPERATOR);
+                    break;
+                case "+":
+                    user_list.add_user (nicks[i], UserType.VOICED);
+                    break;
+                default:
+                    user_list.add_user (nicks[i], UserType.REGULAR);
+                    break;
+            }
+        }
+    }
+
+    public bool has_user (string name) {
+        return user_list.has_user (name);
+    }
+
+    public void rename_user (string? old_name, string new_name,
+                             UserType type, bool silent = false) {
+
+        if (old_name == null) {
+            add_user (new_name, type, true);
+            return;
+        }
+
+        remove_user (old_name, "", true);
+        add_user (new_name, type, true);
+        
+        if (!silent)
+            chat.message_nick (old_name, new_name);
+    }
+
+    public void add_user (string name, UserType type, bool silent = false) {
+        user_list.add_user (name, type);
+        if (!silent)
+            chat.message_join (name);
+    }
+
+    public void remove_user (string name, string message, bool silent = false) {
+        user_list.remove_user (name);
+        if (!silent)
+            chat.message_part (name, message);
+    }
+}

=== added file 'src/Adapters/Widgets/Server.vala'
--- src/Adapters/Widgets/Server.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/Server.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,100 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * This class represents a connection to a network. It is an expandable item in the
+ * source list.
+ */
+public class Cable.Adapter.Widgets.Server : Granite.Widgets.SourceList.ExpandableItem, Port.View.Server {
+
+    public Gee.ArrayList <Port.View.Chat> chats {
+        owned get {
+            var _chats = new Gee.ArrayList <Port.View.Chat> ();
+            foreach (var child in children)
+                _chats.add (child as Port.View.Chat);
+            return _chats;
+       }
+    }
+
+    public bool away {
+        set {
+            away_menu_item.label = (value) ? _("Mark Present") : _("Mark Away");
+            away_menu_item.show_all ();
+        }
+    }
+    
+    public string id { get; set; }
+
+    Gtk.Menu menu;
+    Gtk.MenuItem away_menu_item;
+    Gtk.MenuItem part_menu_item;
+
+    internal Server (string name, string id) {
+        GLib.Object (name: name, id: id);
+        setup_contextmenu ();
+    }
+
+    void setup_contextmenu ()
+        requires (menu == null)
+        ensures (menu != null) {
+        
+        this.menu = new Gtk.Menu ();
+
+        this.away_menu_item = new Gtk.MenuItem.with_label (_("Mark Away"));
+        this.part_menu_item = new Gtk.MenuItem.with_label (_("Leave All Channels"));
+
+        menu.append (away_menu_item);
+        menu.append (part_menu_item);
+
+        away_menu_item.activate.connect (() => toggle_away ());
+        part_menu_item.activate.connect (() => part_all ());
+
+        menu.show_all ();
+    }
+
+    public override Gtk.Menu? get_context_menu () {
+        if (menu != null && menu.get_attach_widget () != null)
+            menu.detach ();
+        return menu;
+    }
+    
+    public void add_channel (string chat_name, string chat_id)
+        requires (!has_chat (chat_name))
+        ensures (has_chat (chat_name)) {
+
+        var chat = new Channel (chat_name, chat_id);
+        add (chat);
+    }
+    
+    public void add_private_chat (string chat_name, string chat_id)
+        requires (!has_chat (chat_name))
+        ensures (has_chat (chat_name)) {
+
+        var chat = new PrivateChat (chat_name, chat_id);
+        add (chat);
+    }
+
+    public void remove_chat (string chat_name)
+        requires (has_chat (chat_name))
+        ensures (!has_chat (chat_name)) {
+
+        var chat = get_chat (chat_name) as Widgets.Chat;
+        remove (chat);
+    }
+}

=== added file 'src/Adapters/Widgets/TopicBar.vala'
--- src/Adapters/Widgets/TopicBar.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/TopicBar.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,72 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Adapter.Widgets.Topic : Gtk.InfoBar {
+
+    /**
+     * The actual topic.
+     */
+    public string topic {
+       get { return topic_label.label; }
+       set {
+            if (value != "") {
+                var new_topic = Utils.parse_string_to_markup (value);
+                topic_label.set_markup (new_topic);
+                topic_label.set_tooltip_text (new_topic);
+                no_show_all = false;
+                show_all ();
+            } else {
+                visible = false;
+                no_show_all = true;
+            }
+       }
+    }
+    
+    Gtk.Button arrow_button;
+    Gtk.Arrow arrow;
+    Gtk.Label topic_label;
+    Gtk.Grid grid; 
+        
+    public Topic () {
+        arrow_button = new Gtk.Button ();
+        arrow = new Gtk.Arrow (Gtk.ArrowType.RIGHT, Gtk.ShadowType.ETCHED_IN);
+        arrow_button.valign = Gtk.Align.START;
+        arrow_button.relief = Gtk.ReliefStyle.NONE;
+        arrow_button.add (arrow);
+        
+        topic_label = new Gtk.Label ("");
+        topic_label.hexpand = true;
+        topic_label.margin_left = 12;
+        topic_label.margin_right = 12;
+        topic_label.ellipsize = Pango.EllipsizeMode.END;
+        topic_label.wrap_mode = Pango.WrapMode.WORD;
+        
+        grid = new Gtk.Grid ();
+        grid.attach (arrow_button, 0, 0, 1, 1);
+        grid.attach (topic_label, 1, 0, 1, 1);
+
+        (get_content_area () as Gtk.Container).add (grid);
+        no_show_all = true;
+        
+        arrow_button.clicked.connect (() => {
+            topic_label.wrap = !topic_label.wrap;
+            arrow.arrow_type = (topic_label.wrap) ? Gtk.ArrowType.DOWN : Gtk.ArrowType.RIGHT;
+        });
+    }
+}

=== added file 'src/Adapters/Widgets/User.vala'
--- src/Adapters/Widgets/User.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/User.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,36 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+// TODO Implement Kick, Ban, Ignore items !
+/*Gtk.MenuItem kick_item;
+Gtk.MenuItem ban_item;
+Gtk.MenuItem ignore_item;*/
+
+public class Cable.Adapter.Widgets.User : Granite.Widgets.SourceList.Item {
+
+    public signal void private_chat_requested ();
+
+    public User (string name) {
+        base (name);
+        
+        activated.connect (() => {
+            private_chat_requested (); // signal
+        });
+    }
+}

=== added file 'src/Adapters/Widgets/UserList.vala'
--- src/Adapters/Widgets/UserList.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/UserList.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,122 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Adapter.Widgets.UserList : Granite.Widgets.SourceList {
+
+    Granite.Widgets.SourceList.ExpandableItem operators;
+    Granite.Widgets.SourceList.ExpandableItem voiced;
+    Granite.Widgets.SourceList.ExpandableItem regular;
+
+    delegate void ForeachFunction (User user);
+
+    public Gee.Set <string> nicks {
+        owned get {
+            var _nicks = new Gee.HashSet <string> ();
+            @foreach ((child) => _nicks.add (child.name));
+            return _nicks as Gee.Set;
+        }
+    }
+    
+    public signal void private_chat_requested (string user_name);
+
+    public UserList () {
+        operators = new Granite.Widgets.SourceList.ExpandableItem (_("Operators"));
+        voiced = new Granite.Widgets.SourceList.ExpandableItem (_("Voiced"));
+        regular = new Granite.Widgets.SourceList.ExpandableItem (_("Regular"));
+
+        regular.expanded = true;
+        operators.expanded = true;
+        voiced.expanded = true;
+
+        hscrollbar_policy = Gtk.PolicyType.NEVER;
+        width_request = 150;
+        set_sort_func ((a,b) => {
+            return a.name.collate (b.name);
+        });
+
+        root.add (operators);
+        root.add (voiced);
+        root.add (regular);
+        
+        no_show_all = true;
+        visible = false;
+    }
+    
+    public bool has_user (string name) {
+        return name in nicks;
+    }
+
+    public void add_user (string name, UserType user_type = UserType.REGULAR) {
+        var user = new User (name);
+        user.selectable = false;
+
+        switch (user_type) {
+            case UserType.OPERATOR:
+                operators.add (user);
+                break;
+            case UserType.VOICED:
+                voiced.add (user);
+                break;
+            default:
+                regular.add (user);
+                break;
+        }
+        
+        user.private_chat_requested.connect (() => {
+            private_chat_requested (user.name);
+        });
+        
+        update_user_counts ();
+        
+        if (visible == false) {
+            no_show_all = false;
+            visible = true;
+        }
+    }
+    
+    public void remove_user (string name) {
+        @foreach ((child) => {
+            if (child.name != name)
+                return;
+            child.parent.remove (child);
+            update_user_counts ();
+        });
+        
+        if (nicks.size == 0) {
+            no_show_all = true;
+            visible = false;
+        }
+    }
+    
+    void update_user_counts () {
+        regular.name = _("Regular") + @" ($(regular.n_children.to_string ()))";
+        operators.name = _("Operators") + @" ($(operators.n_children.to_string ()))";
+        voiced.name = _("Voiced") + @" ($(voiced.n_children.to_string ()))";
+    }
+    
+    new void @foreach (ForeachFunction func) {
+        Granite.Widgets.SourceList.ExpandableItem[] lists = {
+            voiced, operators, regular
+        };
+        
+        foreach (var list in lists)
+            foreach (var child in list.children)
+                func (child as User);
+    }
+}

=== added file 'src/Adapters/Widgets/Welcome.vala'
--- src/Adapters/Widgets/Welcome.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/Welcome.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,143 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Adapter.Widgets.Welcome : Granite.Widgets.Welcome {
+
+    public signal void done (string address, string nick, string channel);
+
+    Gtk.Entry channel_entry;
+    Gtk.Button connect_button;
+    Gtk.ComboBoxText server_entry;
+    Gtk.ComboBoxText id_entry;
+
+    public Welcome () {
+        base (_("Connect to IRC"), _("Select a channel to join and begin to talk."));
+
+        var grid = new Gtk.Grid ();
+        grid.margin = 12;
+        grid.column_spacing = 6;
+        grid.row_spacing = 6;
+
+        // Labels
+        var server_label = new Gtk.Label (_("Network:"));
+        server_label.halign = Gtk.Align.END;
+        server_label.valign = Gtk.Align.CENTER;
+
+        var id_label = new Gtk.Label (_("Identity:"));
+        id_label.halign = Gtk.Align.END;
+        id_label.valign = Gtk.Align.CENTER;
+
+        var channel_label = new Gtk.Label (_("Channel:"));
+        channel_label.halign = Gtk.Align.END;
+        channel_label.valign = Gtk.Align.CENTER;
+
+        connect_button = new Gtk.Button.with_label (_("Connect"));
+        connect_button.get_style_context ().add_class ("suggested-action");
+        connect_button.sensitive = false;
+
+        var connect_button_grid = new Gtk.Grid ();
+        var connect_fake_label = new Gtk.Label ("");
+        connect_fake_label.hexpand = true;
+        connect_button_grid.attach (connect_fake_label, 0, 0, 1, 1);
+        connect_button_grid.attach (connect_button, 1, 0, 1, 1);
+
+        // Entries/Comboboxes
+        server_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Utils.Network.all.size; i++)
+            server_entry.append (i.to_string (), Utils.Network.all[i].name);
+        server_entry.active = 0;
+
+        id_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Utils.Identity.all.size; i++) {
+            id_entry.append (i.to_string (), Utils.Identity.all[i].nick_name);
+            if (Utils.Identity.all[i].nick_name == Settings.preferences.last_used_nick)
+                id_entry.active = i;
+        }
+        
+        if (Settings.preferences.last_used_nick == "")
+            id_entry.active = 0;
+
+        channel_entry = new Gtk.Entry ();
+        channel_entry.text = "#";
+        channel_entry.width_request = 250;
+
+        grid.attach (server_label, 0, 0, 1, 1);
+        grid.attach (server_entry, 1, 0, 1, 1);
+
+        grid.attach (id_label, 0, 1, 1, 1);
+        grid.attach (id_entry, 1, 1, 1, 1);
+        grid.attach (channel_label, 0, 2, 1, 1);
+        grid.attach (channel_entry, 1, 2, 1, 1);
+        grid.attach (connect_button_grid, 1, 3, 1, 1);
+        grid.margin = 6;
+
+        channel_entry.insert_text.connect ((text) => {
+            Utils.filter (channel_entry, text, {" ", ":"});
+        });
+        id_entry.changed.connect (() => {
+            if (channel_entry.text.length > 1 && server_entry.get_active_text ().length > 0 && id_entry.get_active_text ().length > 0) {
+                connect_button.sensitive = true;
+            } else {
+                connect_button.set_sensitive (false);
+            };
+        });
+        server_entry.changed.connect (() => {
+            if (channel_entry.text.length > 1 && server_entry.get_active_text ().length > 0 && id_entry.get_active_text ().length > 0) {
+                connect_button.sensitive = true;
+            } else {
+                connect_button.set_sensitive (false);
+            };
+        });
+        channel_entry.changed.connect (() => {
+            if (channel_entry.text.length > 1 && server_entry.get_active_text ().length > 0 && id_entry.get_active_text ().length > 0) {
+                connect_button.sensitive = true;
+            } else {
+                connect_button.set_sensitive (false);
+            };
+        });
+
+        connect_button.clicked.connect (() => channel_entry.activate ());
+        channel_entry.activate.connect (() => {
+            Utils.Network network;
+            Utils.Identity identity;
+            
+            if (server_entry.active_id == null) {
+                network = new Utils.Network (server_entry.get_active_text ());
+            } else {
+                network = Utils.Network.all[int.parse (server_entry.active_id)];
+            }
+
+            if (id_entry.active_id == null) {
+                identity = new Utils.Identity (id_entry.get_active_text ());
+            } else {
+                identity = Utils.Identity.all[int.parse (id_entry.active_id)];
+            }
+            
+            done (network.address, identity.nick_name, channel_entry.text);
+        });
+
+        options.add (grid);
+        this.show_all ();
+    }
+
+    public void focus_channel_entry () {
+        channel_entry.grab_focus ();
+        channel_entry.set_position (-1);
+    }
+}

=== added file 'src/Adapters/Widgets/Window.vala'
--- src/Adapters/Widgets/Window.vala	1970-01-01 00:00:00 +0000
+++ src/Adapters/Widgets/Window.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,293 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+namespace Cable {
+    public Gtk.ActionGroup main_actions;
+}
+
+public class Cable.Adapter.Widgets.Window : Gtk.Window, Port.View.Window {
+
+    Granite.Widgets.SourceList server_list;
+    Gtk.EventBox display_box;
+    Gtk.Grid layout;
+    Gtk.Grid server_grid;
+    Granite.Widgets.ThinPaned paned;
+    Widgets.Welcome welcome;
+
+    Gtk.Toolbar channel_control;
+    Gtk.ToolButton join_button;
+    Gtk.ToolButton leave_button;
+    Gtk.ToolButton prefs_button;
+
+    Gtk.UIManager ui;
+
+    private bool window_maximized = false;
+    private int window_width = 0;
+    private int window_height = 0;
+
+    const string ui_string = """
+        <ui>
+            <popup name="MenuItemTool">
+                <menuitem name="Join Channel" action="JoinChannel"/>
+                <menuitem name="Leave Channel" action="LeaveChannel"/>
+                <menuitem name="Edit Identity" action="EditCurrentId"/>
+            </popup>
+        </ui>
+    """;
+
+    public const string TITLE = "Cable";
+
+    /**
+     * Get or set the widget displayed next to the source list.
+     */
+    Gtk.Widget display_widget {
+        get { return display_box.get_children ().nth_data (0); }
+        set {
+            var content = display_box.get_children ().nth_data (0);
+
+            if (content != null)
+                display_box.remove (content);
+
+            display_box.add (value);
+            display_box.show_all ();
+        }
+    }
+
+    /**
+     * Wether the welcome screen is shown or not.
+     */
+    public bool welcome_shown {
+        get { return layout.get_child_at (0, 1) == welcome; }
+        set {
+            if (value) {
+                var widget = layout.get_child_at (0, 1);
+                if (widget != null)
+                    layout.remove (widget);
+                layout.attach (welcome, 0, 1, 1, 1);
+                title = TITLE;
+                welcome.focus_channel_entry ();
+                this.show_all ();
+            } else {
+                var widget = layout.get_child_at (0, 1);
+                if (widget != null)
+                    layout.remove (widget);
+                layout.attach (paned, 0, 1, 1, 1);
+                this.show_all ();
+            }
+        }
+    }
+
+    public Gee.ArrayList <Port.View.Server> servers {
+        owned get {
+            var _servers = new Gee.ArrayList <Port.View.Server> ();
+            foreach (var child in server_list.root.children)
+                _servers.add (child as Port.View.Server);
+            return _servers;
+        }
+    }
+
+    /**
+     * Get the server of the currently selected channel.
+     */
+    public Port.View.Server? current_server {
+        get { return server_list.selected.parent as Port.View.Server; }
+    }
+
+    /**
+     * Get the currently selected channel.
+     */
+    public Port.View.Chat? current_chat {
+        get { return server_list.selected as Port.View.Chat; }
+        set { server_list.selected = value as Widgets.Chat; }
+    }
+
+    //public signal void edit_identity ();
+
+    public Window (Cable.App app) {
+        GLib.Object (application: app);
+        init_actions ();
+        init_layout ();
+
+        server_list.item_selected.connect ((item) => {
+            if (item != null) {
+                display_widget = (current_chat as Widgets.Chat).room;
+                selected (current_chat);
+            }
+        });
+
+        welcome.done.connect ((a,n,c) => {
+            join (a,n,c);
+        });
+
+        destroy.connect (() => {
+            close ();
+        });
+    }
+
+   void init_actions () {
+        main_actions = new Gtk.ActionGroup ("MainActionGroup");
+        main_actions.set_translation_domain (Constants.GETTEXT_PACKAGE);
+        main_actions.add_actions (main_entries, this);
+
+        ui = new Gtk.UIManager ();
+
+        try {
+            ui.add_ui_from_string (ui_string, -1);
+        } catch (Error e) {
+            error ("Couldn't load the UI: %s", e.message);
+        }
+
+        Gtk.AccelGroup accel_group = ui.get_accel_group ();
+        add_accel_group (accel_group);
+
+        ui.insert_action_group (main_actions, 0);
+        ui.ensure_update ();
+    }
+
+    void init_layout () {
+        this.title = TITLE;
+        this.icon_name = "internet-chat";
+        this.set_default_size (Settings.saved_state.window_width, Settings.saved_state.window_height);
+        this.window_position = Gtk.WindowPosition.CENTER;
+
+        switch (Settings.saved_state.window_state) {
+            case Settings.SavedState.WindowState.MAXIMIZED:
+                window_maximized = true;
+                this.maximize ();
+                break;
+        }
+
+        layout = new Gtk.Grid ();
+
+        server_list = new Granite.Widgets.SourceList ();
+        server_list.width_request = 150;
+
+        display_box = new Gtk.EventBox ();
+        paned = new Granite.Widgets.ThinPaned ();
+
+        channel_control = new Gtk.Toolbar ();
+        channel_control.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
+
+        join_button = main_actions.get_action ("JoinChannel").create_tool_item() as Gtk.ToolButton;
+        leave_button = main_actions.get_action ("LeaveChannel").create_tool_item() as Gtk.ToolButton;
+        prefs_button = main_actions.get_action ("Preferences").create_tool_item() as Gtk.ToolButton;
+
+        var expander = new Gtk.SeparatorToolItem ();
+        expander.set_draw (true);
+        expander.set_expand (true);
+
+        welcome = new Widgets.Welcome ();
+        welcome.hexpand = true;
+        welcome.vexpand = true;
+
+        channel_control.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        channel_control.add (join_button);
+        channel_control.add (leave_button);
+        channel_control.add (expander);
+        channel_control.add (prefs_button);
+
+        server_grid = new Gtk.Grid ();
+        server_grid.attach (server_list, 0, 0, 1, 1);
+        server_grid.attach (channel_control, 0, 1, 1, 1);
+
+        paned.position = Settings.saved_state.column_server_width;
+        paned.pack1 (server_grid, false, false);
+        paned.pack2 (display_box, true, false);
+
+        this.add (layout);
+        this.show_all ();
+    }
+
+    /*private void close () {
+        Settings.saved_state.window_width = window_width;
+        Settings.saved_state.window_height = window_height;
+        Settings.saved_state.column_server_width = paned.position;
+
+        if (window_maximized)
+            Settings.saved_state.window_state = Settings.SavedState.WindowState.MAXIMIZED;
+        else
+            Settings.saved_state.window_state = Settings.SavedState.WindowState.NORMAL;
+    }*/
+
+    void action_join_channel () {
+        add_channel ();
+    }
+
+    void action_leave_channel () {
+        remove_channel ();
+    }
+
+    void action_edit_identity () {
+        /*edit_identity ();
+        var dialog = new Dialogs.ManageIdentity (server_list.current_server.backend.identity);
+        dialog.show_all ();*/
+    }
+
+    void action_preferences () {
+        show_preferences ();
+    }
+
+
+    /**
+     * Removes a server from the List.
+     */
+    public void remove_server (string server_id)
+        /*requires (has_server (server_id))*/
+        ensures (!has_server (server_id)) {
+
+        var server = get_server_by_id (server_id);
+        return_if_fail (server is Widgets.Server);
+        server_list.root.remove (server as Widgets.Server);
+    }
+
+    /**
+     * Add server.
+     */
+    public Port.View.Server? add_server (string server_name, string server_id)
+        requires (!has_server (server_id))
+        ensures (has_server (server_id)) {
+
+        var server = new Widgets.Server (server_name, server_id);
+        server.expanded = true;
+        server_list.root.add (server);
+        return (Port.View.Server) server;
+    }
+
+    static const Gtk.ActionEntry[] main_entries = {
+        { "JoinChannel", "list-add-symbolic", N_("Join Channel…"), "<Control>j",
+          N_("Join Channel…"), action_join_channel },
+
+        { "LeaveChannel", "list-remove-symbolic", N_("Leave current Channel"), "<Control>l",
+          N_("Leave current Channel"), action_leave_channel },
+
+        { "EditCurrentId", "avatar-default-symbolic", N_("Edit current Identity…"), "<Control>i",
+          N_("Edit current Identity…"), action_edit_identity },
+
+        { "Preferences", "document-properties-symbolic", N_("Preferences"), null,
+          N_("Preferences"), action_preferences }
+    };
+
+    public override bool configure_event (Gdk.EventConfigure event) {
+        window_maximized = (get_window ().get_state () == Gdk.WindowState.MAXIMIZED);
+
+        get_size (out window_width, out window_height);
+
+        return base.configure_event (event);
+    }
+}

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2013-09-28 12:37:00 +0000
+++ src/Cable.vala	2013-09-29 09:56:16 +0000
@@ -84,8 +84,8 @@
     }
 
     public override void activate () {
-        var window = new Widgets.Window (this);
-        var irc = new Irc.Session ();
+        var window = new Adapter.Widgets.Window (this);
+        var irc = new Adapter.Irc.Session ();
         var controller = new Controller.Window (window, irc);
 
         add_window (window);

=== removed directory 'src/Controller'
=== removed file 'src/Controller/Channel.vala'
--- src/Controller/Channel.vala	2013-09-28 12:37:00 +0000
+++ src/Controller/Channel.vala	1970-01-01 00:00:00 +0000
@@ -1,275 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Cable.Controller.Channel : GLib.Object {
-
-    public weak Server server;
-    public View.Channel view;
-    public Port.Irc.Channel backend;
-
-    public string name; //TODO id
-
-    public Channel (Server server, string name) {
-        this.server = server;
-        this.name = name;
-
-        if (server.view.has_chat (name) == false)
-            server.view.add_channel (name, name);
-
-        view = server.view.get_chat (name) as View.Channel;
-        view.nick = server.nick;
-        backend = server.backend.get_or_create_channel (name);
-
-        connect_frontend_signals ();
-        connect_backend_signals ();
-
-        load_state ();
-    }
-
-    void load_state () {
-        /*if (backend.joined) {
-            view.room.state = Widgets.Room.State.CHAT;
-            FIXME some bug in maki returns garbage here:
-            -> view.room.list_users (backend.nicks, backend.prefixes);
-            backend.event_topic (backend.topic, "");
-        } else {
-            view.room.state = Widgets.Room.State.JOINING;
-        }*/
-        // part and rejoin to workaround bug
-        view.state = State.JOINING;
-
-        if (server.backend.connected == false) {
-            server.backend.event_connected.connect (() => {
-                if (backend.joined)
-                    backend.send_part ();
-                backend.send_join ();
-            });
-        } else {
-            if (backend.joined)
-                backend.send_part ();
-            backend.send_join ();
-        }
-    }
-
-    // GUI signals
-    void connect_frontend_signals () {
-        view.part.connect (() => {
-            backend.send_part ();
-        });
-
-        server.window.view.selected.connect ((item) => {
-            if (item == view)
-                view.unread_messages = 0;
-        });
-
-        view.join.connect (() => {
-            view.state = State.JOINING;
-            backend.send_join ();
-        });
-
-        view.send_message.connect ((message) => {
-            if (message.has_prefix ("/"))
-                send_command (message.replace ("/", ""));
-            else
-                server.backend.send_message (name, message);
-
-            view.entry = "";
-        });
-
-        view.focused.connect (() => {
-            Services.Launcher.jobs = 0;
-            Services.Launcher.urgent = false;
-            return false;
-        });
-
-        view.private_chat_requested.connect ((name) => {
-            server.open_new_chat_with (name);
-            if (server.private_chats.has_key (name))
-                server.window.view.current_chat = server.private_chats [name].view;
-        });
-    }
-
-    // IRC signals
-    void connect_backend_signals () {
-        backend.event_message.connect ((from, message) => {
-            if (server.window.view.current_chat != view)
-                view.unread_messages++;
-        });
-
-        backend.event_topic.connect ((from, topic) => {
-            view.topic = topic;
-        });
-
-        server.backend.event_nick.connect ((from, new_nick) => {
-            if (server.backend.is_me (from)) {
-                view.nick = new_nick;
-            }
-
-            assert (new_nick != null);
-
-            var name = from.split ("!")[0];
-
-            if (!view.has_user (name))
-                return;
-
-            if (name.has_prefix ("@"))
-                view.rename_user (name.replace ("@", ""), new_nick, UserType.OPERATOR);
-            else if (name.has_prefix ("+"))
-                view.rename_user (name.replace ("+", ""), new_nick, UserType.VOICED);
-            else
-                view.rename_user (name, new_nick, UserType.REGULAR);
-        });
-
-        backend.event_part.connect ((from, message) => {
-            if (server.backend.is_me (from)) {
-               view.state = State.NOT_JOINED;
-            } else {
-                var name = from.split ("!")[0];
-
-                if (name.has_prefix ("@"))
-                    view.remove_user (name.replace ("@", ""), message);
-                else if (name.has_prefix ("+"))
-                    view.remove_user (name.replace ("+", ""), message);
-                else
-                    view.remove_user (name, message);
-            }
-        });
-
-        backend.event_join.connect ((from) => {
-            if (server.backend.is_me (from)) {
-                view.state = State.CHAT;
-            } else {
-                var name = from.split ("!")[0];
-
-                if (name.has_prefix ("@"))
-                    view.add_user (name.replace ("@", ""), UserType.OPERATOR);
-                else if (name.has_prefix ("+"))
-                    view.add_user (name.replace ("+", ""), UserType.VOICED);
-                else
-                    view.add_user (name, UserType.REGULAR);
-            }
-        });
-
-        backend.event_no_such.connect (() => {
-            view.state = State.NO_SUCH;
-        });
-
-        backend.event_message.connect ((from, message) => {
-            var nick = from.split ("!") [0];
-
-            if (message.contains (server.nick)) {
-
-                if (view.has_focus == false) {
-                    Services.Notify.send (nick, message);
-                    Services.Launcher.jobs++;
-                    Services.Launcher.urgent = true;
-                }
-
-                view.message (nick, message, MessageType.PING);
-            } else {
-                view.message (nick, message);
-            }
-        });
-
-        backend.event_action.connect ((from, message) => {
-            var nick = from.split ("!")[0];
-            view.message ("", "* " + nick + " " + message, MessageType.ACTION);
-        });
-
-        backend.event_names.connect (view.list_users);
-    }
-
-    void send_command (string command) {
-
-        var args = command.split (" ");
-
-        switch (args[0]) {
-            case "join":
-                return_if_fail (args.length > 1);
-                var channel_with_hash = args[1];
-                if (channel_with_hash.slice(0, 1) != "#") {
-                    channel_with_hash = "#" + args[1];
-                }
-                var channel = new Channel (server, channel_with_hash);
-                server.channels[channel_with_hash] = channel;
-                server.window.view.current_chat = channel.view;
-                break;
-
-            case "part":
-                backend.send_part ();
-                break;
-
-            case "quit":
-                server.backend.send_quit ();
-                break;
-
-            case "nick":
-                return_if_fail (args.length > 1);
-                server.backend.send_nick (args[1]);
-                break;
-
-            case "topic":
-                return_if_fail (args.length > 1);
-                backend.send_topic (string.joinv (" ", args[1:-1]));
-                break;
-
-            case "me":
-            case "action":
-                return_if_fail (args.length > 1);
-                backend.send_action (string.joinv (" ", args[1:-1]));
-                break;
-
-            case "kick":
-                return_if_fail (args.length > 2);
-                backend.send_kick (args[1], string.joinv (" ", args[2:-1]));
-                break;
-
-            case "ignore":
-                return_if_fail (args.length > 1);
-                server.backend.send_ignore (string.joinv (" ", args[1:-1]));
-                break;
-
-            case "unignore":
-                return_if_fail (args.length > 1);
-                server.backend.send_unignore (string.joinv (" ", args[1:-1]));
-                break;
-
-            case "msg":
-                return_if_fail (args.length > 2);
-                server.backend.send_message (args[1], string.joinv (" ", args[2:-1]));
-                break;
-
-            case "notice":
-                return_if_fail (args.length > 2);
-                server.backend.send_notice (args[1], string.joinv (" ", args[2:-1]));
-                break;
-
-            case "away":
-                if (args.length < 2)
-                    server.backend.send_back ();
-                else
-                    server.backend.send_away (string.joinv (" ", args[1:-1]));
-                break;
-
-            default:
-                server.backend.send_raw (command);
-                break;
-        }
-    }
-}

=== removed file 'src/Controller/PrivateChat.vala'
--- src/Controller/PrivateChat.vala	2013-09-27 16:37:41 +0000
+++ src/Controller/PrivateChat.vala	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Cable.Controller.PrivateChat : GLib.Object {
-    
-    public weak Server server;
-    public View.PrivateChat view;
-    string id;
-    
-    public PrivateChat (Server server, string id, string message = "") {
-        this.id = id;
-        this.server = server;
-        
-        server.view.add_private_chat (id, id);
-        view = server.view.get_chat (id) as View.PrivateChat;
-        view.nick = server.nick;
-        
-        if (message != "")
-            display_message_and_notify (id, server.nick, message);
-        
-        connect_signals ();
-    }
-    
-    void connect_signals () {
-        server.backend.event_message.connect (display_message_and_notify);
-        view.send_message.connect (send_message_and_display);
-        server.window.view.selected.connect (clear_unread_messages);
-    }
-    
-    void display_message_and_notify (string from, string target, string message) {
-        if (is_not_me (target))
-            return;
-            
-        if (is_not_correspondent (from))
-            return;
-        
-        var nick_from = from.split ("!")[0];
-        
-        view.message (nick_from, message);
-        
-        if (view.has_focus == false) {
-            Services.Notify.send (nick_from, message);
-            Services.Launcher.jobs++;
-            Services.Launcher.urgent = true;
-        }
-        
-        if (server.window.view.current_chat != view)
-            view.unread_messages++;
-    }
-    
-    void send_message_and_display (string message) {
-        server.backend.send_message (id.split("!")[0], message);
-        view.message (server.nick, message);
-        view.entry = "";
-    }
-    
-    void clear_unread_messages (View.Chat chat) {
-        if (chat == view)
-            view.unread_messages = 0;
-    }
-    
-    bool is_not_me (string nick) {
-        return nick != server.nick;
-    }
-    
-    bool is_not_correspondent (string from) {
-        return from.split ("!")[0] != id;
-    }
-}

=== removed file 'src/Controller/Server.vala'
--- src/Controller/Server.vala	2013-09-28 12:37:00 +0000
+++ src/Controller/Server.vala	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Cable.Controller.Server : GLib.Object {
-
-    public weak Window window;
-    public View.Server view;
-    public Port.Irc.Server backend;
-    
-    public string nick; // FIXME not reliable
-    public string address; // FIXME not reliable
-    public string name;
-
-    public Gee.HashMap <string, Channel> channels {
-        get; set; default = new Gee.HashMap <string, Channel>  ();
-    }
-    
-    public Gee.HashMap <string, PrivateChat> private_chats {
-        get; set; default = new Gee.HashMap <string, PrivateChat>  ();
-    }
-
-    public Server (string address, string nick, Window window) {
-        this.backend = window.backend.get_or_create_server (address, nick);
-
-        this.name = backend.name;
-        this.window = window;
-        this.nick = nick;
-        this.address = address;
-        
-        if (!backend.connected)
-            backend.send_connect ();
-
-        this.view = window.view.add_server (@"$(backend.address) - $(nick)", backend.name);
-
-        connect_frontend_signals ();
-        connect_backend_signals ();
-    }
-    
-    void connect_frontend_signals () {
-        view.toggle_away.connect (() =>  {
-            if (backend.away) {
-                backend.send_back ();
-            } else {
-                backend.send_away ();
-            }
-        });
-
-        view.part_all.connect (() => {
-            foreach (var channel in channels.values)
-                channel.backend.send_part ();
-        });
-    }
-    
-    void connect_backend_signals () {
-        backend.event_user_away.connect ((from, away) => {
-            if (backend.is_me (from)) {
-                view.away = away;
-            }
-            
-            var nick = from.split("!")[0];
-            
-            foreach (var channel in channels.values)
-                if ( nick in channel.backend.nicks )
-                    channel.view.set_away_status (nick, away);
-        });
-        
-        backend.event_quit.connect ((from, message) => {
-            var nick = from.split ("!")[0];
-            
-            foreach (var channel in channels.values)
-                channel.view.remove_user (nick, message);
-        });
-        
-        backend.event_message.connect ((from, target, message) => {
-            if (target != nick)
-                return;
-            
-            var from_nick = from.split ("!")[0];
-            
-            open_new_chat_with (from_nick, message);
-        });
-    }
-    
-    public void open_new_chat_with (string from_nick, string message = "") {
-        if (from_nick == backend.nick)
-            return;
-            
-        if (!private_chats.has_key (from_nick)) {
-            var chat = new PrivateChat (this, from_nick, message);
-            private_chats [from_nick] = chat;
-        }
-    }
-}

=== removed file 'src/Controller/Window.vala'
--- src/Controller/Window.vala	2013-09-28 12:37:00 +0000
+++ src/Controller/Window.vala	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Cable.Controller.Window : GLib.Object {
-
-    public View.Window view { get; set; }
-    public Port.Irc.Session backend { get; construct; }
-    
-    public Gee.HashMap <string, Server> servers {
-        get; set;
-        default = new Gee.HashMap <string, Server> ();
-    }
-
-    public Window (View.Window window, Port.Irc.Session session) {
-        GLib.Object (view: window, backend: session);
-
-        connect_frontend_signals ();
-        connect_backend_signals ();
-        initialize ();
-    }
-
-    // restore saved state
-    void initialize () {
-        var channels = Settings.preferences.channels;
-
-        // check for channels from last session
-        if (channels.length > 0) {
-            foreach (var channel in channels) {
-                var parts = channel.split (":");
-                return_if_fail (parts.length == 3);
-                join_channel (parts[0], parts[1], parts[2]);
-            }
-        }
-
-        if (servers.size == 0)
-            view.welcome_shown = true;
-    }
-
-    // backend events that affect the window's state
-    void connect_backend_signals () {
-        /*Irc.client.event_nick.connect ((time, server, from, nick) => {
-            var current_chat = view.current_chat;
-            var current_server = view.current_server;
-
-            if (server == current_server.id)
-                view.title = string.join (" — ", current_chat.name, nick);
-        });*/
-    }
-
-    // frontend signals from the window
-    void connect_frontend_signals () {
-        view.selected.connect ((item) => {
-            if (item is View.Channel) {
-                var channel = item as View.Channel;
-                view.title = string.join (" — ", channel.name);
-                Settings.preferences.last_used_nick = channel.nick;
-            }
-        });
-
-        view.join.connect ((a,n,c) => {
-            join_channel (a,n,c);
-        });
-
-        view.remove_channel.connect (() => {
-            var channel_id = view.current_chat.id;
-            var server_id = view.current_server.id;
-
-            if (view.current_chat == null) {
-                warning ("No channel selected, cannot leave.");
-            } else if (view.current_chat is View.Channel) {
-                part_channel (servers[server_id].channels[channel_id]);
-            } else if (view.current_chat is View.PrivateChat) {
-                var channel = servers[server_id].private_chats[channel_id];
-                var server = channel.server;
-                server.view.remove_chat (channel.view.id);
-                server.private_chats.unset (channel.view.id);
-
-                if (server.channels.size == 0)
-                    servers.unset (server.view.id);
-
-                if (servers.size == 0) {
-                    view.title = App.TITLE;
-                    view.welcome_shown = true;
-                }
-            }
-        });
-
-        view.add_channel.connect (() => {
-            var dialog = new Dialogs.JoinChannel ();
-            dialog.done.connect ((a,b,c) => join_channel (a.address,b.nick_name,c));
-            dialog.show_all ();
-        });
-
-        view.show_preferences.connect (() => {
-            var dialog = new Dialogs.Preferences ();
-            dialog.show_all ();
-        });
-
-        view.close.connect (() => {
-            string[] chans = {};
-
-            foreach (var server in servers.values) {
-                foreach (var channel in server.channels.values) {
-                    chans += string.join (":", server.address, server.nick, channel.name);
-                    channel.backend.send_part ();
-                }
-            }
-
-            Settings.preferences.channels = chans;
-        });
-    }
-
-    void join_channel (string address, string nick, string channel_name) {
-        Server server = null;
-        foreach (var s in servers.values)
-            if (s.address == address && s.nick == nick)
-                server = s;
-
-        if (server == null) {
-            server = new Server (address, nick, this);
-            servers[server.backend.name] = server;
-        }
-
-        if (server.view.has_chat (channel_name)) {
-            warning ("Channel is already joined");
-            return;
-        }
-
-        var channel = new Channel (server, channel_name);
-        server.channels[channel_name] = channel;
-        
-        view.current_chat = channel.view;
-        view.welcome_shown = false;
-    }
-
-    void part_channel (Channel channel) {
-        var server = channel.server;
-
-        channel.backend.send_part ();
-        server.view.remove_chat (channel.view.id);
-        server.channels.unset (channel.view.id);
-
-        if (server.channels.size == 0)
-            servers.unset (server.view.id);
-
-        if (servers.size == 0) {
-            view.title = App.TITLE;
-            view.welcome_shown = true;
-        }
-    }
-}

=== added directory 'src/Controllers'
=== added file 'src/Controllers/Channel.vala'
--- src/Controllers/Channel.vala	1970-01-01 00:00:00 +0000
+++ src/Controllers/Channel.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,275 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Controller.Channel : GLib.Object {
+
+    public weak Server server;
+    public Port.View.Channel view;
+    public Port.Irc.Channel backend;
+
+    public string name; //TODO id
+
+    public Channel (Server server, string name) {
+        this.server = server;
+        this.name = name;
+
+        if (server.view.has_chat (name) == false)
+            server.view.add_channel (name, name);
+
+        view = server.view.get_chat (name) as Port.View.Channel;
+        view.nick = server.nick;
+        backend = server.backend.get_or_create_channel (name);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+
+        load_state ();
+    }
+
+    void load_state () {
+        /*if (backend.joined) {
+            view.room.state = Widgets.Room.State.CHAT;
+            FIXME some bug in maki returns garbage here:
+            -> view.room.list_users (backend.nicks, backend.prefixes);
+            backend.event_topic (backend.topic, "");
+        } else {
+            view.room.state = Widgets.Room.State.JOINING;
+        }*/
+        // part and rejoin to workaround bug
+        view.state = State.JOINING;
+
+        if (server.backend.connected == false) {
+            server.backend.event_connected.connect (() => {
+                if (backend.joined)
+                    backend.send_part ();
+                backend.send_join ();
+            });
+        } else {
+            if (backend.joined)
+                backend.send_part ();
+            backend.send_join ();
+        }
+    }
+
+    // GUI signals
+    void connect_frontend_signals () {
+        view.part.connect (() => {
+            backend.send_part ();
+        });
+
+        server.window.view.selected.connect ((item) => {
+            if (item == view)
+                view.unread_messages = 0;
+        });
+
+        view.join.connect (() => {
+            view.state = State.JOINING;
+            backend.send_join ();
+        });
+
+        view.send_message.connect ((message) => {
+            if (message.has_prefix ("/"))
+                send_command (message.replace ("/", ""));
+            else
+                server.backend.send_message (name, message);
+
+            view.entry = "";
+        });
+
+        view.focused.connect (() => {
+            Services.Launcher.jobs = 0;
+            Services.Launcher.urgent = false;
+            return false;
+        });
+
+        view.private_chat_requested.connect ((name) => {
+            server.open_new_chat_with (name);
+            if (server.private_chats.has_key (name))
+                server.window.view.current_chat = server.private_chats [name].view;
+        });
+    }
+
+    // IRC signals
+    void connect_backend_signals () {
+        backend.event_message.connect ((from, message) => {
+            if (server.window.view.current_chat != view)
+                view.unread_messages++;
+        });
+
+        backend.event_topic.connect ((from, topic) => {
+            view.topic = topic;
+        });
+
+        server.backend.event_nick.connect ((from, new_nick) => {
+            if (server.backend.is_me (from)) {
+                view.nick = new_nick;
+            }
+
+            assert (new_nick != null);
+
+            var name = from.split ("!")[0];
+
+            if (!view.has_user (name))
+                return;
+
+            if (name.has_prefix ("@"))
+                view.rename_user (name.replace ("@", ""), new_nick, UserType.OPERATOR);
+            else if (name.has_prefix ("+"))
+                view.rename_user (name.replace ("+", ""), new_nick, UserType.VOICED);
+            else
+                view.rename_user (name, new_nick, UserType.REGULAR);
+        });
+
+        backend.event_part.connect ((from, message) => {
+            if (server.backend.is_me (from)) {
+               view.state = State.NOT_JOINED;
+            } else {
+                var name = from.split ("!")[0];
+
+                if (name.has_prefix ("@"))
+                    view.remove_user (name.replace ("@", ""), message);
+                else if (name.has_prefix ("+"))
+                    view.remove_user (name.replace ("+", ""), message);
+                else
+                    view.remove_user (name, message);
+            }
+        });
+
+        backend.event_join.connect ((from) => {
+            if (server.backend.is_me (from)) {
+                view.state = State.CHAT;
+            } else {
+                var name = from.split ("!")[0];
+
+                if (name.has_prefix ("@"))
+                    view.add_user (name.replace ("@", ""), UserType.OPERATOR);
+                else if (name.has_prefix ("+"))
+                    view.add_user (name.replace ("+", ""), UserType.VOICED);
+                else
+                    view.add_user (name, UserType.REGULAR);
+            }
+        });
+
+        backend.event_no_such.connect (() => {
+            view.state = State.NO_SUCH;
+        });
+
+        backend.event_message.connect ((from, message) => {
+            var nick = from.split ("!") [0];
+
+            if (message.contains (server.nick)) {
+
+                if (view.has_focus == false) {
+                    Services.Notify.send (nick, message);
+                    Services.Launcher.jobs++;
+                    Services.Launcher.urgent = true;
+                }
+
+                view.message (nick, message, MessageType.PING);
+            } else {
+                view.message (nick, message);
+            }
+        });
+
+        backend.event_action.connect ((from, message) => {
+            var nick = from.split ("!")[0];
+            view.message ("", "* " + nick + " " + message, MessageType.ACTION);
+        });
+
+        backend.event_names.connect (view.list_users);
+    }
+
+    void send_command (string command) {
+
+        var args = command.split (" ");
+
+        switch (args[0]) {
+            case "join":
+                return_if_fail (args.length > 1);
+                var channel_with_hash = args[1];
+                if (channel_with_hash.slice(0, 1) != "#") {
+                    channel_with_hash = "#" + args[1];
+                }
+                var channel = new Channel (server, channel_with_hash);
+                server.channels[channel_with_hash] = channel;
+                server.window.view.current_chat = channel.view;
+                break;
+
+            case "part":
+                backend.send_part ();
+                break;
+
+            case "quit":
+                server.backend.send_quit ();
+                break;
+
+            case "nick":
+                return_if_fail (args.length > 1);
+                server.backend.send_nick (args[1]);
+                break;
+
+            case "topic":
+                return_if_fail (args.length > 1);
+                backend.send_topic (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "me":
+            case "action":
+                return_if_fail (args.length > 1);
+                backend.send_action (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "kick":
+                return_if_fail (args.length > 2);
+                backend.send_kick (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "ignore":
+                return_if_fail (args.length > 1);
+                server.backend.send_ignore (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "unignore":
+                return_if_fail (args.length > 1);
+                server.backend.send_unignore (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "msg":
+                return_if_fail (args.length > 2);
+                server.backend.send_message (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "notice":
+                return_if_fail (args.length > 2);
+                server.backend.send_notice (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "away":
+                if (args.length < 2)
+                    server.backend.send_back ();
+                else
+                    server.backend.send_away (string.joinv (" ", args[1:-1]));
+                break;
+
+            default:
+                server.backend.send_raw (command);
+                break;
+        }
+    }
+}

=== added file 'src/Controllers/PrivateChat.vala'
--- src/Controllers/PrivateChat.vala	1970-01-01 00:00:00 +0000
+++ src/Controllers/PrivateChat.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,85 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Controller.PrivateChat : GLib.Object {
+    
+    public weak Server server;
+    public Port.View.PrivateChat view;
+    string id;
+    
+    public PrivateChat (Server server, string id, string message = "") {
+        this.id = id;
+        this.server = server;
+        
+        server.view.add_private_chat (id, id);
+        view = server.view.get_chat (id) as Port.View.PrivateChat;
+        view.nick = server.nick;
+        
+        if (message != "")
+            display_message_and_notify (id, server.nick, message);
+        
+        connect_signals ();
+    }
+    
+    void connect_signals () {
+        server.backend.event_message.connect (display_message_and_notify);
+        view.send_message.connect (send_message_and_display);
+        server.window.view.selected.connect (clear_unread_messages);
+    }
+    
+    void display_message_and_notify (string from, string target, string message) {
+        if (is_not_me (target))
+            return;
+            
+        if (is_not_correspondent (from))
+            return;
+        
+        var nick_from = from.split ("!")[0];
+        
+        view.message (nick_from, message);
+        
+        if (view.has_focus == false) {
+            Services.Notify.send (nick_from, message);
+            Services.Launcher.jobs++;
+            Services.Launcher.urgent = true;
+        }
+        
+        if (server.window.view.current_chat != view)
+            view.unread_messages++;
+    }
+    
+    void send_message_and_display (string message) {
+        server.backend.send_message (id.split("!")[0], message);
+        view.message (server.nick, message);
+        view.entry = "";
+    }
+    
+    void clear_unread_messages (Port.View.Chat chat) {
+        if (chat == view)
+            view.unread_messages = 0;
+    }
+    
+    bool is_not_me (string nick) {
+        return nick != server.nick;
+    }
+    
+    bool is_not_correspondent (string from) {
+        return from.split ("!")[0] != id;
+    }
+}

=== added file 'src/Controllers/Server.vala'
--- src/Controllers/Server.vala	1970-01-01 00:00:00 +0000
+++ src/Controllers/Server.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,109 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Controller.Server : GLib.Object {
+
+    public weak Window window;
+    public Port.View.Server view;
+    public Port.Irc.Server backend;
+    
+    public string nick; // FIXME not reliable
+    public string address; // FIXME not reliable
+    public string name;
+
+    public Gee.HashMap <string, Channel> channels {
+        get; set; default = new Gee.HashMap <string, Channel>  ();
+    }
+    
+    public Gee.HashMap <string, PrivateChat> private_chats {
+        get; set; default = new Gee.HashMap <string, PrivateChat>  ();
+    }
+
+    public Server (string address, string nick, Window window) {
+        this.backend = window.backend.get_or_create_server (address, nick);
+
+        this.name = backend.name;
+        this.window = window;
+        this.nick = nick;
+        this.address = address;
+        
+        if (!backend.connected)
+            backend.send_connect ();
+
+        this.view = window.view.add_server (@"$(backend.address) - $(nick)", backend.name);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+    }
+    
+    void connect_frontend_signals () {
+        view.toggle_away.connect (() =>  {
+            if (backend.away) {
+                backend.send_back ();
+            } else {
+                backend.send_away ();
+            }
+        });
+
+        view.part_all.connect (() => {
+            foreach (var channel in channels.values)
+                channel.backend.send_part ();
+        });
+    }
+    
+    void connect_backend_signals () {
+        backend.event_user_away.connect ((from, away) => {
+            if (backend.is_me (from)) {
+                view.away = away;
+            }
+            
+            var nick = from.split("!")[0];
+            
+            foreach (var channel in channels.values)
+                if ( nick in channel.backend.nicks )
+                    channel.view.set_away_status (nick, away);
+        });
+        
+        backend.event_quit.connect ((from, message) => {
+            var nick = from.split ("!")[0];
+            
+            foreach (var channel in channels.values)
+                channel.view.remove_user (nick, message);
+        });
+        
+        backend.event_message.connect ((from, target, message) => {
+            if (target != nick)
+                return;
+            
+            var from_nick = from.split ("!")[0];
+            
+            open_new_chat_with (from_nick, message);
+        });
+    }
+    
+    public void open_new_chat_with (string from_nick, string message = "") {
+        if (from_nick == backend.nick)
+            return;
+            
+        if (!private_chats.has_key (from_nick)) {
+            var chat = new PrivateChat (this, from_nick, message);
+            private_chats [from_nick] = chat;
+        }
+    }
+}

=== added file 'src/Controllers/Window.vala'
--- src/Controllers/Window.vala	1970-01-01 00:00:00 +0000
+++ src/Controllers/Window.vala	2013-09-29 09:56:16 +0000
@@ -0,0 +1,167 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Controller.Window : GLib.Object {
+
+    public Port.View.Window view { get; set; }
+    public Port.Irc.Session backend { get; construct; }
+    
+    public Gee.HashMap <string, Server> servers {
+        get; set;
+        default = new Gee.HashMap <string, Server> ();
+    }
+
+    public Window (Port.View.Window window, Port.Irc.Session session) {
+        GLib.Object (view: window, backend: session);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+        initialize ();
+    }
+
+    // restore saved state
+    void initialize () {
+        var channels = Settings.preferences.channels;
+
+        // check for channels from last session
+        if (channels.length > 0) {
+            foreach (var channel in channels) {
+                var parts = channel.split (":");
+                return_if_fail (parts.length == 3);
+                join_channel (parts[0], parts[1], parts[2]);
+            }
+        }
+
+        if (servers.size == 0)
+            view.welcome_shown = true;
+    }
+
+    // backend events that affect the window's state
+    void connect_backend_signals () {
+        /*Irc.client.event_nick.connect ((time, server, from, nick) => {
+            var current_chat = view.current_chat;
+            var current_server = view.current_server;
+
+            if (server == current_server.id)
+                view.title = string.join (" — ", current_chat.name, nick);
+        });*/
+    }
+
+    // frontend signals from the window
+    void connect_frontend_signals () {
+        view.selected.connect ((item) => {
+            if (item is Port.View.Channel) {
+                var channel = item as Port.View.Channel;
+                view.title = string.join (" — ", channel.name);
+                Settings.preferences.last_used_nick = channel.nick;
+            }
+        });
+
+        view.join.connect ((a,n,c) => {
+            join_channel (a,n,c);
+        });
+
+        view.remove_channel.connect (() => {
+            var channel_id = view.current_chat.id;
+            var server_id = view.current_server.id;
+
+            if (view.current_chat == null) {
+                warning ("No channel selected, cannot leave.");
+            } else if (view.current_chat is Port.View.Channel) {
+                part_channel (servers[server_id].channels[channel_id]);
+            } else if (view.current_chat is Port.View.PrivateChat) {
+                var channel = servers[server_id].private_chats[channel_id];
+                var server = channel.server;
+                server.view.remove_chat (channel.view.id);
+                server.private_chats.unset (channel.view.id);
+
+                if (server.channels.size == 0)
+                    servers.unset (server.view.id);
+
+                if (servers.size == 0) {
+                    view.title = App.TITLE;
+                    view.welcome_shown = true;
+                }
+            }
+        });
+
+        view.add_channel.connect (() => {
+            var dialog = new Dialogs.JoinChannel ();
+            dialog.done.connect ((a,b,c) => join_channel (a.address,b.nick_name,c));
+            dialog.show_all ();
+        });
+
+        view.show_preferences.connect (() => {
+            var dialog = new Dialogs.Preferences ();
+            dialog.show_all ();
+        });
+
+        view.close.connect (() => {
+            string[] chans = {};
+
+            foreach (var server in servers.values) {
+                foreach (var channel in server.channels.values) {
+                    chans += string.join (":", server.address, server.nick, channel.name);
+                    channel.backend.send_part ();
+                }
+            }
+
+            Settings.preferences.channels = chans;
+        });
+    }
+
+    void join_channel (string address, string nick, string channel_name) {
+        Server server = null;
+        foreach (var s in servers.values)
+            if (s.address == address && s.nick == nick)
+                server = s;
+
+        if (server == null) {
+            server = new Server (address, nick, this);
+            servers[server.backend.name] = server;
+        }
+
+        if (server.view.has_chat (channel_name)) {
+            warning ("Channel is already joined");
+            return;
+        }
+
+        var channel = new Channel (server, channel_name);
+        server.channels[channel_name] = channel;
+        
+        view.current_chat = channel.view;
+        view.welcome_shown = false;
+    }
+
+    void part_channel (Channel channel) {
+        var server = channel.server;
+
+        channel.backend.send_part ();
+        server.view.remove_chat (channel.view.id);
+        server.channels.unset (channel.view.id);
+
+        if (server.channels.size == 0)
+            servers.unset (server.view.id);
+
+        if (servers.size == 0) {
+            view.title = App.TITLE;
+            view.welcome_shown = true;
+        }
+    }
+}

=== modified file 'src/Dialogs/Preferences.vala'
--- src/Dialogs/Preferences.vala	2013-09-23 17:29:15 +0000
+++ src/Dialogs/Preferences.vala	2013-09-29 09:56:16 +0000
@@ -20,14 +20,14 @@
 namespace Cable.Dialogs {
 
     public bool identity_is_in_use (Utils.Identity identity) {
-        foreach (var server in Irc.Server.all)
+        foreach (var server in Adapter.Irc.Server.all) // FIXME
             if (server.identity == identity && server.channel_names.length > 0)
                 return true;
         return false;
     }
     
     public bool network_is_in_use (Utils.Network network) {
-        foreach (var server in Irc.Server.all)
+        foreach (var server in Adapter.Irc.Server.all) // FIXME
             if (server.network == network && server.channel_names.length > 0)
                 return true;
         return false;

=== removed directory 'src/Irc'
=== removed file 'src/Irc/Channel.vala'
--- src/Irc/Channel.vala	2013-09-26 18:14:11 +0000
+++ src/Irc/Channel.vala	1970-01-01 00:00:00 +0000
@@ -1,279 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-public class Cable.Irc.Channel : GLib.Object, Port.Irc.Channel {
-
-    public string server_name { get; private set; }
-
-    public string name { get; set; }
-
-    string _topic = "";
-    public string topic {
-        get {
-            try {
-                _topic = client.channel_topic (server_name, this.name);
-            } catch (GLib.IOError error) {
-                warning (error.message);
-            }
-            
-            return _topic;
-        }
-    }
-
-    string[] _nicks = {};
-    public string[] nicks {
-        get {
-            try {
-                client.channel_nicks (server_name, this.name, out _nicks, out _prefixes);
-            } catch (GLib.IOError error) {
-                warning (error.message);
-            }
-            
-            return _nicks;
-        }
-    }
-
-    string[] _prefixes = {};
-    public string[] prefixes {
-        get {
-            try {
-                client.channel_nicks (server_name, this.name, out _nicks, out _prefixes);
-            } catch (GLib.IOError error) {
-                warning (error.message);
-            }
-            
-            return _prefixes;
-        }
-    }
-
-    public bool joined {
-        get {
-            try {
-                return name in client.channels (server_name);
-            } catch (GLib.IOError error) {
-                warning (error.message);
-            }
-            
-            return false;
-        }
-    }
-
-    public Channel (string channel_name, string server_name) {
-        this.name = channel_name;
-        this.server_name = server_name;
-        setup_signals ();
-    }
-
-    /**
-     * Send a message displayed in "third person"
-     * @param message The message to be sent.
-     */
-    public void send_action (string message) {
-        try {
-            client.action (server_name, name, message);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Invite a person to join this channel.
-     * @param who Nick name of the person to invite.
-     */
-    public void send_invite (string who) {
-        try {
-            client.invite (server_name, name, who);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Join this channel.
-     * @param key Password to this channel. Should be "" if there is no password.
-     */
-    public void send_join (string key = "") {
-        try {
-            client.join (server_name, name, key);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Kick a user from the channel. Requires operator privileges.
-     * @param who Nick name of the user to be kicked.
-     * @param message Reason why the user has been kicked.
-     */
-    public void send_kick (string who, string message) {
-        try {
-            client.kick (server_name, name, who, message);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Request topic and number of users for this channel TODO move somewhere else
-     */
-    public void send_list () {
-        try {
-            client.list (server_name, name);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Send a normal message in this channel.
-     * @param message The message.
-     */
-    public void send_message (string message) {
-        try {
-            client.message (server_name, name, message);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Request a list of names from the channel.
-     */
-    public void send_names () {
-        try {
-            client.names (server_name, name);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Leave this channel.
-     * @param message Part message to be displayed. If null it will be fetched from the identity.
-     */
-    public void send_part (string? message = null) {
-        try {
-            client.part (server_name, name, message ?? "");
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Change or request the channel's topic.
-     * @param topic The new topic, or "" if you just want to query the current topic.
-     */
-    public void send_topic (string topic = "") {
-        try {
-            client.topic (server_name, name, topic);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-    }
-
-    /**
-     * Get the channel mode for a given user.
-     * @param nick Nick name of the user.
-     */
-    public string user_channel_mode (string nick) {
-        try {
-            return client.user_channel_mode (server_name, name, nick);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-        
-        return "";
-    }
-
-    /**
-     * Get the channel prefix ("@", "+") of a given user.
-     * @param nick Nick name of the user.
-     */
-    public string user_channel_prefix (string nick) {
-        try {
-            return client.user_channel_prefix (server_name, name, nick);
-        } catch (GLib.IOError error) {
-            warning (error.message);
-        }
-        
-        return "";
-    }
-    
-    void setup_signals () {
-        client.event_action.connect ((time, server, from, target, message) => {
-            if (server == this.server_name && name == target)
-                event_action (from, message);
-        });
-        
-        client.event_banlist.connect ((time, server, channel, mask, who, when) => {
-            if (server == this.server_name && name == channel)
-                event_banlist (mask, who, when);
-        });
-
-        client.event_cannot_join.connect ((time, server, channel, reason) => {
-            if (server == this.server_name && name == channel)
-                event_cannot_join (reason);
-        });
-
-        client.event_invite.connect ((time, server, from, channel, who) => {
-            if (server == this.server_name && name == channel)
-                event_invite (from, who);
-        });
-
-        client.event_join.connect ((time, server, from, channel) => {
-            if (server == this.server_name && name == channel)
-                event_join (from);
-        });
-
-        client.event_kick.connect ((time, server, from, channel, who, message) => {
-            if (server == this.server_name && name == channel)
-                event_kick (from, who, message);
-        });
-
-        client.event_list.connect ((time, server, channel, users, topic) => {
-            if (server == this.server_name && name == channel)
-                event_list (users, topic);
-        });
-        
-        client.event_message.connect ((time, server, from, target, message) => {
-            if (server == this.server_name && name == target)
-                event_message (from, message);
-        });
-
-        client.event_names.connect ((time, server, channel, nicks, prefixes) => {
-            if (server == this.server_name && name == channel)
-                event_names (nicks, prefixes);
-        });
-
-        client.event_no_such.connect ((time, server, target, type) => {
-            if (server == this.server_name && name == target && type == "c")
-                event_no_such ();
-        });
-
-        client.event_part.connect ((time, server, from, channel, message) => {
-            if (server == this.server_name && name == channel)
-                event_part (from, message);
-        });
-
-        client.event_topic.connect ((time, server, from, channel, topic) => {
-            if (server == this.server_name && name == channel)
-                event_topic (from, topic);
-        });
-    }
-}

=== removed file 'src/Irc/Maki.vala'
--- src/Irc/Maki.vala	2013-07-30 00:52:16 +0000
+++ src/Irc/Maki.vala	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * This is a dbus interface to the maki daemon from the SushiIRC project.
- * Use the methods to send requests or messages to the server and the
- * signals to react to the server's replies.
- */
-[DBus (name = "de.ikkoku.sushi", timeout = 120000)]
-public interface Cable.Irc.Maki : GLib.Object {
-
-    [DBus (name = "action")]
-    public abstract void action (string server, string channel, string message) throws GLib.IOError;
-
-    [DBus (name = "away")]
-    public abstract void away (string server, string message) throws GLib.IOError;
-
-    [DBus (name = "back")]
-    public abstract void back (string server) throws GLib.IOError;
-
-    [DBus (name = "channel_nicks")]
-    public abstract void channel_nicks (string server, string channel, out string[] nicks, out string[] prefixes) throws GLib.IOError;
-
-    [DBus (name = "channel_topic")]
-    public abstract string channel_topic (string server, string channel) throws GLib.IOError;
-
-    [DBus (name = "channels")]
-    public abstract string[] channels (string server) throws GLib.IOError;
-
-    [DBus (name = "config_get")]
-    public abstract string config_get (string group, string key) throws GLib.IOError;
-
-    [DBus (name = "config_set")]
-    public abstract void config_set (string group, string key, string value) throws GLib.IOError;
-
-    // connect to a server known to maki
-    [DBus (name = "connect")]
-    public abstract void connect (string server) throws GLib.IOError;
-
-    [DBus (name = "ctcp")]
-    public abstract void ctcp (string server, string target, string message) throws GLib.IOError;
-
-    [DBus (name = "dcc_send")]
-    public abstract void dcc_send(string server, string target, string path) throws GLib.IOError;
-
-    [DBus (name = "dcc_sends")]
-    public abstract void dcc_sends (out uint64[] ids, out string[] servers, out string[] froms, out string[] filenames, out uint64[] sizes, out uint64[] progresses, out uint64[] speeds, out uint64[] statuses) throws GLib.IOError;
-
-    [DBus (name = "dcc_send_accept")]
-    public abstract void dcc_send_accept (uint64 id) throws GLib.IOError;
-
-    [DBus (name = "dcc_send_get")]
-    public abstract string dcc_send_get (uint64 id, string key) throws GLib.IOError;
-
-    [DBus (name = "dcc_send_remove")]
-    public abstract void dcc_send_remove (uint64 id) throws GLib.IOError;
-
-    [DBus (name = "dcc_send_resume")]
-    public abstract void dcc_send_resume (uint64 id) throws GLib.IOError;
-
-    [DBus (name = "dcc_send_set")]
-    public abstract void dcc_send_set (uint64 id, string key, string value) throws GLib.IOError;
-
-    [DBus (name = "ignore")]
-    public abstract void ignore (string server, string pattern) throws GLib.IOError;
-
-    [DBus (name = "ignores")]
-    public abstract string[] ignores (string server) throws GLib.IOError;
-
-    [DBus (name = "invite")]
-    public abstract void invite (string server, string channel, string who) throws GLib.IOError;
-
-    [DBus (name = "join")]
-    public abstract void join (string server, string channel, string key) throws GLib.IOError;
-
-    [DBus (name = "kick")]
-    public abstract void kick (string server, string channel, string who, string message) throws GLib.IOError;
-
-    [DBus (name = "list")]
-    public abstract void list (string server, string channel) throws GLib.IOError;
-
-    [DBus (name = "log")]
-    public abstract string[] log (string server, string target, uint64 lines) throws GLib.IOError;
-
-    [DBus (name = "message")]
-    public abstract void message (string server, string target, string message) throws GLib.IOError;
-
-    [DBus (name = "mode")]
-    public abstract void mode (string server, string target, string mode) throws GLib.IOError;
-
-    [DBus (name = "names")]
-    public abstract void names (string server, string channel) throws GLib.IOError;
-
-    [DBus (name = "nick")]
-    public abstract void nick (string server, string nick) throws GLib.IOError;
-
-    [DBus (name = "nickserv")]
-    public abstract void nickserv (string server) throws GLib.IOError;
-
-    [DBus (name = "notice")]
-    public abstract void notice (string server, string target, string message) throws GLib.IOError;
-
-    [DBus (name = "oper")]
-    public abstract void oper (string server, string name, string password) throws GLib.IOError;
-
-    [DBus (name = "part")]
-    public abstract void part (string server, string channel, string message) throws GLib.IOError;
-
-    [DBus (name = "quit")]
-    public abstract void quit (string server, string message) throws GLib.IOError;
-
-    [DBus (name = "raw")]
-    public abstract void raw (string server, string command) throws GLib.IOError;
-
-    [DBus (name = "server_get")]
-    public abstract string server_get (string server, string group, string key) throws GLib.IOError;
-
-    [DBus (name = "server_get_list")]
-    public abstract string[] server_get_list (string server, string group, string key) throws GLib.IOError;
-
-    // server_list ("", "") gives a list of servers known to maki
-    [DBus (name = "server_list")]
-    public abstract string[] server_list (string server, string group) throws GLib.IOError;
-
-    [DBus (name = "server_remove")]
-    public abstract void server_remove (string server, string group, string key) throws GLib.IOError;
-
-    [DBus (name = "server_rename")]
-    public abstract void server_rename (string old, string new_) throws GLib.IOError;
-
-    [DBus (name = "server_set")]
-    public abstract void server_set (string server, string group, string key, string value) throws GLib.IOError;
-
-    [DBus (name = "server_set_list")]
-    public abstract void server_set_list (string server, string group, string key, string[] list) throws GLib.IOError;
-
-    [DBus (name = "servers")]
-    public abstract string[] servers () throws GLib.IOError;
-
-    [DBus (name = "shutdown")]
-    public abstract void shutdown (string message) throws GLib.IOError;
-
-    [DBus (name = "support_chantypes")]
-    public abstract string support_chantypes (string server) throws GLib.IOError;
-
-    [DBus (name = "support_prefix")]
-    public abstract string[] support_prefix (string server) throws GLib.IOError;
-
-    [DBus (name = "topic")]
-    public abstract void topic (string server, string channel, string topic) throws GLib.IOError;
-
-    [DBus (name = "unignore")]
-    public abstract void unignore (string server, string pattern) throws GLib.IOError;
-
-    [DBus (name = "user_away")]
-    public abstract bool user_away (string server, string nick) throws GLib.IOError;
-
-    [DBus (name = "user_channel_mode")]
-    public abstract string user_channel_mode (string server, string channel, string nick) throws GLib.IOError;
-
-    [DBus (name = "user_channel_prefix")]
-    public abstract string user_channel_prefix (string server, string channel, string nick) throws GLib.IOError;
-
-    [DBus (name = "user_from")]
-    public abstract string user_from (string server, string nick) throws GLib.IOError;
-
-    [DBus (name = "version")]
-    public abstract uint64[] version () throws GLib.IOError;
-
-    [DBus (name = "who")]
-    public abstract void who (string server, string mask, bool operators_only) throws GLib.IOError;
-
-    [DBus (name = "whois")]
-    public abstract void whois (string server, string mask) throws GLib.IOError;
-
-    [DBus (name = "action")]
-    public signal void event_action (int64 time, string server, string from, string target, string message);
-
-    [DBus (name = "away")]
-    public signal void event_away (int64 time, string server);
-
-    [DBus (name = "away_message")]
-    public signal void event_away_message (int64 time, string server, string nick, string message);
-
-    [DBus (name = "back")]
-    public signal void event_back (int64 time, string server);
-
-    [DBus (name = "banlist")]
-    public signal void event_banlist (int64 time, string server, string channel, string mask, string who, int64 when);
-
-    [DBus (name = "cannot_join")]
-    public signal void event_cannot_join (int64 time, string server, string channel, string reason);
-
-    [DBus (name = "connect")]
-    public signal void event_connect (int64 time, string server);
-
-    [DBus (name = "connected")]
-    public signal void event_connected (int64 time, string server);
-
-    [DBus (name = "ctcp")]
-    public signal void event_ctcp (int64 time, string server, string from, string target, string message);
-
-    [DBus (name = "dcc_send")]
-    public signal void event_dcc_send (int64 time, string server, uint64 id, string from, string filename, uint64 size, uint64 progress, uint64 speed, uint64 status);
-
-    [DBus (name = "error")]
-    public signal void event_error (int64 time, string server, string domain, string reason, string[] arguments);
-
-    [DBus (name = "invite")]
-    public signal void event_invite (int64 time, string server, string from, string channel, string who);
-
-    [DBus (name = "join")]
-    public signal void event_join (int64 time, string server, string from, string channel);
-
-    [DBus (name = "kick")]
-    public signal void event_kick (int64 time, string server, string from, string channel, string who, string message);
-
-    [DBus (name = "list")]
-    public signal void event_list (int64 time, string server, string channel, int64 users, string topic);
-
-    [DBus (name = "message")]
-    public signal void event_message (int64 time, string server, string from, string target, string message);
-
-    [DBus (name = "mode")]
-    public signal void event_mode (int64 time, string server, string from, string target, string mode, string parameter);
-
-    [DBus (name = "motd")]
-    public signal void event_motd (int64 time, string server, string message);
-
-    [DBus (name = "names")]
-    public signal void event_names (int64 time, string server, string channel, string[] nicks, string[] prefixes);
-
-    [DBus (name = "nick")]
-    public signal void event_nick (int64 time, string server, string from, string new_nick);
-
-    [DBus (name = "no_such")]
-    public signal void event_no_such (int64 time, string server, string target, string type);
-
-    [DBus (name = "notice")]
-    public signal void event_notice (int64 time, string server, string from, string target, string message);
-
-    [DBus (name = "oper")]
-    public signal void event_oper (int64 time, string server);
-
-    [DBus (name = "part")]
-    public signal void event_part (int64 time, string server, string from, string channel, string message);
-
-    [DBus (name = "quit")]
-    public signal void event_quit (int64 time, string server, string from, string message);
-
-    [DBus (name = "shutdown")]
-    public signal void event_shutdown (int64 time);
-
-    [DBus (name = "topic")]
-    public signal void event_topic (int64 time, string server, string from, string channel, string topic);
-
-    [DBus (name = "user_away")]
-    public signal void event_user_away (int64 time, string server, string from, bool away);
-
-    [DBus (name = "whois")]
-    public signal void event_whois (int64 time, string server, string nick, string message);
-}

=== removed file 'src/Irc/Server.vala'
--- src/Irc/Server.vala	2013-09-28 16:47:27 +0000
+++ src/Irc/Server.vala	1970-01-01 00:00:00 +0000
@@ -1,621 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * Cable.Irc.ServerConfig is a class that allows you to change the configuration of a server.
- * This configuration is a normal keyfile. Possible keys are:
- *
- *  autoconnect (should always be true)
- *  port (default, maki takes care of this)
- *  ssl (-> network)
- *  nick (-> identity)
- *  user (automatic)
- *  name (-> identity)
- *  address (-> network)
- *  nickserv (-> server, I guess...)
- */
-private class Cable.Irc.ServerConfig : GLib.Object {
-
-    // The server's name. Used by maki.
-    public string name { get; set; }
-
-    public ServerConfig (string name) {
-        Object (name: name);
-    }
-
-    public new string @get (string key) {
-        string result = "";
-