Merge lp:~julien-spautz/cable/clean-up into lp:cable

[Julien Spautz]

Just testing for conflicts, please don't merge.

[Julien Spautz (julien-spautz)]

This is now almost ready for merging. There are still a few regressiong left because of the switch to maki as backend daemon, which I'll try to fix asap so we can continue enhancing cable and implementing new features.

[Julián Unrrein (junrrein)]

If you'd like more people to test this when this is ready, I offer my help. Just shoot me an email.

[Julien Spautz (julien-spautz)]

I'll start implementing this: https://blueprints.launchpad.net/cable/+spec/identities-and-networks

After this is done, we can start reviewing.

[Julien Spautz (julien-spautz)]

Ok, I guess the branch is now kind of working. I need some feedback in case there are any important bugs, else this branch is ready for merging into trunk.

[lp:~julien-spautz/cable/clean-up]

56. By Julien Spautz on 2013-06-22

replaced toolber with status bar, entry not yet resizing

57. By Julien Spautz on 2013-06-22

added new statusbar file

58. By Julien Spautz on 2013-06-22

small fixes

59. By Julien Spautz on 2013-06-22

fixed duplicates in user list

[Auroral Xylon (avlabs314)]

This branch is looking pretty good now...Small bugs can be fixed later on I guess...Merge time?

[lp:~julien-spautz/cable/clean-up]

60. By Julien Spautz on 2013-06-23

entry now expands and is centered correctly, buttons on the right are misaligned

61. By Julien Spautz on 2013-06-23

added file

62. By Julien Spautz on 2013-06-23

make pot

[Eduard Gotwig (gotwig)]

Nickname entry description should tell the user that hes not able to use spaces or special charachters;

The join channel dialog shouldnt autoselect the # charachter as a selection;

when the user enters an alphabetical charachter as the first charachter for a channel, cable IRC Suite should automaticly prepend a "#" charachter before this.

review: Needs Fixing

[Julián Unrrein (junrrein)]

I can't compile your branch as of rev62:

/clean-up/src/Widgets/Room.vala:91.27-91.61: error: Assignment: Cannot convert from `Gtk.Widget' to `Gtk.Container?'
            Gtk.Container content = topic.get_content_area ();
                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

PS: Consider adding me to the reviewer list of this merge proposal, so I get automatically notified of new comments.

review: Needs Fixing

[Julián Unrrein (junrrein)]

Do you enforce a certain version of valac? I am using 0.16.

[Julián Unrrein (junrrein)]

@gotwig

Shouldn't we just focus on checking that this branch solves all the bugs and implements all the blueprints linked? Because everything you mentioned seems to be nonrelated details.

[Eduard Gotwig (gotwig)]

@Junrrein

This branch offers a new look, and a new implementation of a design specification. With this, it should not make the UX of Cable IRC Suite worse.

[Auroral Xylon (avlabs314)]

I have always had @junrreins problem; I fixed this in trunk but I presums that Julien Spautz's branch is based of an older revsion. To fix the compile error, you need to put '(Gtk.Container)' before topic so it looks like this:

Gtk.Container content = (Gtk.Container)topic.get_content_area ();

However, there are also some disagreementtwith the design. Until we can resolve them,' the branch should not be merged.

[lp:~julien-spautz/cable/clean-up]

63. By Julien Spautz on 2013-06-25

fixed a few things

[Julián Unrrein (junrrein)]

@gotwig

In trunk the identity dialog doesn't check if the input contains spaces or special characters, so the situation is the same here.

As for the other details, they are very minor nuisances which can be taken care of at another moment.

[Julián Unrrein (junrrein)]

@xylon

I am aware I can type-cast the compile error away, but that is not the problem.

It is apparent that Julien didn't even try to compile his branch before pushing his latest revisions. I am reluctant to test code that wasn't tested by the developer.

[Julien Spautz (julien-spautz)]

@junrrein

I did try the code and it compiled fine for me, the compiler error xylon mentionned existed in trunk but it didn't affect me there either. It's now been fixed, so I hope it now works for you too.

This is the merge request that fixed the bug in trunk, and as you can see, the bug never affected me. https://code.launchpad.net/~avlabs314/cable/cable/+merge/168510

[Julián Unrrein (junrrein)]

@Julien

I talked to xylon about this a minute ago, and we concluded this might be pinned down to different versions of valac being used. I'm sorry for the "accusation". If I standed out as rude, it wasn't my intention.

I can now compile rev63 just fine, thanks. I'll be testing this.

[Julián Unrrein (junrrein)]

I noticed a couple of issues:

1 - New identities can't join channels in the same session they are created. After closing Cable and restarting it, the new identity works just as expected. I can reproduce this always.

2 - The first time Cable is opened (in a new desktop session) console output reveals it connects every past identity to each correspondent server - even identities that were erased from Cable (and from Dconf). This is related with the previous issue because after connecting sucesfully with an identity, erasing it will not trigger the first bug again.

review: Needs Fixing

[Julien Spautz (julien-spautz)]

Thanks for testing!

1) I don't (yet) know how to fix this, as there is no documentation for maki, the backend daemon. I'm currently performing some hackish tests which are relatively reliable, but I'm still searching for a way to test if maki is connected to a specific server or not.

2) Shouldn't be too hard to fix, but again, maki really lacks documentation…

( And don't worry, I'm not offended ;) )

[Julián Unrrein (junrrein)]

About item 2: This makes impossible to change the current nick to one that was used previously, even if you are not using it right now.

Curiously, changing the current nick to another one which was never used doesn't trigger item 1.
The nick is changed correctly when seen from the outside.
From the inside, the nick shown in the window title only changes when changing to another channel and then back.
The nick shown in the operators/users lists isn't changed in any of the current opened channels. It will stay the same until you leave those channels and join again. New channels will join the nick correctly.

[Julián Unrrein (junrrein)]

The last line should read "New channels will show the nick correctly".

[Julián Unrrein (junrrein)]

About the linked bugs:

(3) Cable doesn't let me join a channel twice. Console output says "Server.vala:336: Channel '#elementary-apps' already joined. Works as intended. UI feedback would be nice, but it's not necessary right now.

(4) The operators/users lists are expanded by default.

(5) I don't know how to test running with invalid Gschemas. Do I just modify any key with random content?

(6) Toolbar buttons have tooltips now.

(7) I can remove identities that I am currently using from the settings dialog - not good.
Identities created using this dialog exhibit the first bug I outlined earlier (bug (1)).
Maybe identities should be tied to specific networks. See my comment in the blueprint (http://goo.gl/r6nr9).

This is looking pretty well!

[Auroral Xylon (avlabs314)]

I am having a problem - cable does not connect to a channel, except it randomly does on a few occasions. Basically, the interface loads - the sidebars and the 'loading topic' text appears but it doesn't actually connect.

Unfortunately, junrrein also had this problem.

review: Needs Fixing

[lp:~julien-spautz/cable/clean-up]

64. By Julien Spautz on 2013-06-28

joining channels should now be more reliable, some internal changes to how settings are handeled

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-29 00:24:15 +0000
+++ CMakeLists.txt	2013-06-28 19:09:26 +0000
@@ -41,22 +41,44 @@
 
 include(ValaPrecompile)
 vala_precompile(VALA_C
-    src/doodleIRC.vala
     src/Cable.vala
-    src/Global.vala
-    src/Settings.vala
+    src/Window.vala
+    src/Utils.vala
+    
+    src/Services/Client.vala
+    src/Services/Settings.vala
+    src/Services/Identity.vala
+    src/Services/Network.vala
+    
     src/Widgets/Room.vala
     src/Widgets/Server.vala
     src/Widgets/Channel.vala
     src/Widgets/ServerList.vala
-    src/Widgets/SettingsDialog.vala
+    src/Widgets/StatusBar.vala
+    src/Widgets/Welcome.vala
+    
+    src/Dialogs/JoinChannel.vala
+    src/Dialogs/Preferences.vala
+    src/Dialogs/ManageIdentity.vala
+    src/Dialogs/ManageNetwork.vala
+    
     ${CMAKE_BINARY_DIR}/src/Config.vala
 PACKAGES
+    gtk+-3.0
     granite
+    #WebKit-3.0
 OPTIONS
     --target-glib=2.32
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
     )
+    
+pkg_check_modules(DEPS REQUIRED
+    glib-2.0>=${TARGET_GLIB}.0
+    gio-2.0>=2.28.0
+    gtk+-3.0>=3.4.0
+    gee-0.8>=0.8.0
+    #webkitgtk-3.0>=1.10.0
+)
 
 add_subdirectory (po)
 

=== modified file 'data/org.pantheon.cable.gschema.xml'
--- data/org.pantheon.cable.gschema.xml	2013-05-26 15:42:50 +0000
+++ data/org.pantheon.cable.gschema.xml	2013-06-28 19:09:26 +0000
@@ -1,27 +1,19 @@
 <schemalist>
     <schema path="/org/pantheon/cable/" id="org.pantheon.cable" gettext-domain="cable">
-        <key name="servers" type="as">
+        <key name="identities" type="as">
             <default>[]</default>
-            <summary>All the todo items</summary>
-            <description></description>
-        </key>
-        <key name="nick" type="s">
-        	<default>""</default>
-        	<summary>Your nick</summary>
-        </key>
-        <key name="real-name" type="s">
-        	<default>""</default>
-        	<summary>Your real name</summary>
-        </key>
-	<key name="login-name" type="as">
-                <default>[]</default>
-                <summary>Your login name for different IRC server</summary>
-                <description>Specify your user accounts in the form  "server:loginname"</description>
+            <summary>Your identities that can be used to connect to networks.</summary>
+            <description>The format is ["nickname:realname:partmsg", "...", ...]</description>
+        </key>
+        <key name="networks" type="as">
+            <default>["irc.freenode.net:Freenode:", "irc.gimp.org:GimpNet:"]</default>
+            <summary>Networks too choose from when joining a channel.</summary>
+            <description>The format is ["address:name:password", "..."]</description>
         </key>
         <key name="channels" type="as">
-        	<default>[]</default>
-        	<summary>Channels to be joined on startup, typically from last session</summary>
-        	<description>These channels in the form "server:#channel" will be joined on startup</description>
+            <default>[]</default>
+            <summary>Channels to be joined on startup, typically from last session</summary>
+            <description>These channels in the form "network address:nickname:#channel" will be joined on startup</description>
         </key>
     </schema>
 </schemalist>

=== modified file 'po/cable.pot'
--- po/cable.pot	2013-06-04 20:46:10 +0000
+++ po/cable.pot	2013-06-28 19:09:26 +0000
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:121
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-04 22:45+0200\n"
+"POT-Creation-Date: 2013-06-23 18:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,87 +18,68 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/gotwig/cable/po/../src/Cable.vala:63
-msgid "Welcome to Cable"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:63
-msgid "Connect to the IRC world"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:65
-#: /home/gotwig/cable/po/../src/Cable.vala:70
-msgid "Join a Channel"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:66
-#: /home/gotwig/cable/po/../src/Widgets/Channel.vala:31
-msgid "Leave Channel"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:67
-msgid "Add a Server"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:68
-msgid "Edit User Settings"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:70
-msgid "Channel"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:71
-#: /home/gotwig/cable/po/../src/Cable.vala:202
-msgid "Server"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:71
-msgid "Add a Custom Server"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:204
-#: /home/gotwig/cable/po/../src/Cable.vala:215
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:8
+msgid "Connect to the IRC world."
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:8
+msgid "Join a Channel."
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:16
+msgid "Network:"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:20
+msgid "Identity:"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:24
+msgid "Channel:"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Welcome.vala:45
 msgid "Join Channel"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Channel.vala:32
-msgid "Mark Away"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Channel.vala:41
-msgid "Away"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:73
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:57
 msgid "Loading Topic…"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:84
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:94
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:203
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:216
 msgid "Operators"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:150
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:154
-msgid "Add Server"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:162
-msgid "Server Name:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:164
-msgid "Server URL:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/SettingsDialog.vala:32
-msgid "Done"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/SettingsDialog.vala:34
-msgid "Nick:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/SettingsDialog.vala:36
-msgid "Real Name:"
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:202
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:215
+msgid "Regular"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:204
+#: /home/tutebatti/cable/po/../src/Widgets/Room.vala:217
+msgid "Voiced"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Channel.vala:31
+msgid "Leave Channel"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:110
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:122
+msgid "Mark Away"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:111
+msgid "Leave all channels"
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:118
+#, c-format
+msgid "%s is away."
+msgstr ""
+
+#: /home/tutebatti/cable/po/../src/Widgets/Server.vala:119
+msgid "Mark Present"
 msgstr ""

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2013-06-07 12:59:28 +0000
+++ src/Cable.vala	2013-06-28 19:09:26 +0000
@@ -1,248 +1,85 @@
-namespace Cable {
-
-    /**
-     * Main class of the application. Manages one window.
-     */
-    public class App : Granite.Application {
-
-        construct {
-            program_name = "Cable";
-            exec_name = "cable";
-
-            build_data_dir = Constants.DATADIR;
-            build_pkg_data_dir = Constants.PKGDATADIR;
-            build_release_name = Constants.RELEASE_NAME;
-            build_version = Constants.VERSION;
-            build_version_info = Constants.VERSION_INFO;
-
-            app_years = "2012";
-
-            app_icon = "applications-chat";
-            app_launcher = "cable.desktop";
-            application_id = "net.launchpad.cable";
-
-            main_url = "https://code.launchpad.net/cable";
-            bug_url = "https://bugs.launchpad.net/cable";
-            help_url = "https://code.launchpad.net/cable";
-            translate_url = "https://translations.launchpad.net/cable";
-
-            about_authors = {"Tom Beckmann <[e-mail]>", "Akshay Shekher <[e-mail]"};
-            about_documenters = {"Tom Beckmann <[e-mail]>"};
-            about_artists = {"Harvey Cabaguio"};
-            about_comments = "Development release, not all features implemented";
-            about_translators = "";
-            about_license_type = Gtk.License.GPL_3_0;
-        }
-
-        Gtk.Window window;
-        bool welcome_shown;
-
-        public Gtk.EventBox display_box;
-        public Widgets.ServerList server_list;
-
-        Gtk.Toolbar toolbar;
-        Gtk.Box layout;
-        Granite.Widgets.ThinPaned paned;
-        Gtk.Box sidebar;
-        Gtk.Menu menu;
-        Granite.Widgets.Welcome welcome;
-
-        public App () {
-            Granite.Services.Logger.initialize ("Cable");
-            Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
-        }
-
-        void build () {
-        
-            window = new Gtk.Window ();
-            layout = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            server_list = new Widgets.ServerList ();
-            display_box = new Gtk.EventBox ();
-            toolbar = new Gtk.Toolbar ();
-            paned = new Granite.Widgets.ThinPaned ();
-            menu = new Gtk.Menu ();
-            sidebar = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            welcome = new Granite.Widgets.Welcome (_("Welcome to Cable"), _("Connect to the IRC world"));
-
-            layout.pack_start( toolbar, false, false, 0);
-
-            var join_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add", Gtk.IconSize.SMALL_TOOLBAR), _("Join a Channel"));
-            var leave_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-remove", Gtk.IconSize.SMALL_TOOLBAR), _("Leave Channel"));
-            var user_settings_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("avatar-default", Gtk.IconSize.SMALL_TOOLBAR), _("Leave Channel"));
-            var add_server_buttton = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("network-server", Gtk.IconSize.SMALL_TOOLBAR), _("Add a Server"));
-            toolbar.insert(join_button, -1);
-            toolbar.insert(leave_button, -1);
-            toolbar.insert(user_settings_button, -1);
-            toolbar.insert(add_server_buttton, -1);
-
-            welcome.append ("internet-web-browser", _("Channel"), _("Join a Channel"));
-            welcome.append ("network-server", _("Server"), _("Add a Custom Server"));
-
-            /*var exp = new Gtk.ToolItem ();
-            exp.set_expand (true);
-
-            menu.append (edit_user);
-
-            toolbar.insert (exp, -1);
-            toolbar.insert (join_button, -1);
-            toolbar.insert (leave_button, -1);
-            toolbar.insert (exp, -1);
-            toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-            toolbar.icon_size = 1;*/
-
-            paned.position = 150;
-
-            sidebar.pack_start (server_list);
-
-            paned.pack1 (sidebar, false, false);
-            paned.pack2 (display_box, true, false);
-
-            window.set_application (this);
-            window.title = "Cable";
-            window.icon_name = "internet-chat";
-            window.set_default_size (740, 480);
-            window.window_position = Gtk.WindowPosition.CENTER;
-
-            welcome.activated.connect ((index) => {
-                if (index == 0) {
-                    var dialog = get_join_dialog ();
-                    dialog.show_all ();
-                    dialog.run ();
-                } else {
-                    var dialog = Widgets.Server.get_add_dialog ();
-                    dialog.show_all ();
-                    dialog.run ();
-                }
-            });
-
-            join_button.clicked.connect (() => {
-                var dialog = get_join_dialog ();
-                dialog.show_all ();
-                dialog.run ();
-            });
-
-            leave_button.clicked.connect (() => {
-                server_list.current_server.leave_channel (server_list.current_channel.name);
-            });
-
-            add_server_buttton.clicked.connect (() => {
-                var dialog = Widgets.Server.get_add_dialog ();
-                dialog.show_all ();
-                dialog.run ();
-            });
-
-            user_settings_button.clicked.connect (() => {
-                var settings_dialog = new Widgets.SettingsDialog ();
-                settings_dialog.show_all ();
-                settings_dialog.run ();
-            });
-
-            server_list.item_selected.connect ((item) => {
-                if (item != null && item is Widgets.Channel) {
-                    display_box.remove (display_box.get_children ().nth_data (0));
-                    display_box.add ((item as Widgets.Channel).room);
-                    display_box.show_all ();
-                }
-            });
-
-            /*initial setup*/
-            var settings = Cable.Settings.get_default ();
-
-            //we got something to do
-            if (settings.channels.length > 0) {
-
-            } else {
-                welcome_shown = true;
-                layout.pack_start (welcome, true, true, 0);
-                window.add (layout);
-                window.show_all ();
-            }
-
-            //configuration incomplete
-            if (settings.real_name == "" || settings.nick == "") {
-                var settings_dialog = new Widgets.SettingsDialog ();
-                settings_dialog.show_all ();
-                settings_dialog.run ();
-            }
-        }
-
-        public void join_channel (string? server_name, string server_URI, string channel_name) {
-            var server = server_list.get_server_by_URI (server_URI)
-                         ?? new Widgets.Server (server_name, server_URI);
-            server_list.add_server (server);
-
-            server.joined_channel.connect ((channel) => {
-                if (welcome_shown) {
-                    welcome_shown = false;
-                    
-                    layout.remove (welcome);
-                    layout.pack_start (paned, true, true, 0);
-                    this.window.add (layout); 
-                    this.window.show_all ();
-
-                    server_list.selected = channel;
-                }
-            });
-
-            server.left_channel.connect ((channel) => {
-                if (server_list.get_n_servers () == 0) {
-                    welcome_shown = true;
-
-                    layout.remove (paned);
-                    layout.pack_start (welcome, true, true, 0);
-                    this.window.add (layout);
-                    this.window.show_all ();
-                }
-            });
-            
-            server.join_channel (channel_name);
-        }
-
-        public Gtk.Dialog get_join_dialog () {
-            var dialog = new Gtk.Dialog ();
-            dialog.modal = true;
-
-            var box = new Gtk.Grid ();
-            box.margin = 12;
-            box.column_spacing = 6;
-            box.row_spacing = 6;
-
-            var entry = new Gtk.Entry ();
-            var serverlabel = new Gtk.Label (_("Server"));
-            entry.secondary_icon_name = "edit-redo-symbolic";
-
-            var list = Widgets.Server.get_server_list ();
-
-            
-            box.attach (serverlabel, 0, 0, 1, 1);
-            serverlabel.set_alignment ( 1, 0.5f);
-            box.attach (list, 1, 0, 1, 1);
-            box.attach (new Gtk.Label (_("Join Channel") + " #"), 0, 1, 1, 1);
-            box.attach (entry, 1, 1, 1, 1);
-            box.margin = 6;
-
-            entry.icon_release.connect (() => entry.activate ());
-            entry.activate.connect (() => {
-                join_channel (list.get_active_text (), list.active_id, "#"+entry.text);
-                dialog.destroy ();
-            });
-
-            (dialog.get_content_area () as Gtk.Container).add (box);
-            dialog.title = _("Join Channel");
-
-            entry.grab_focus ();
-
-            return dialog;
-        }
-
-        public override void activate () {
-            build ();
-        }
-    }
-}
-
-public static int main (string [] args) {
-    Gtk.init (ref args);
-    var cable = new Cable.App ();
-    return cable.run (args);
-}
+/***
+    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.
+***/
+
+/**
+ * Main class of the application.
+ */
+public class Cable.App : Granite.Application {
+
+    construct {
+        build_data_dir = Constants.DATADIR;
+        build_pkg_data_dir = Constants.PKGDATADIR;
+        build_release_name = Constants.RELEASE_NAME;
+        build_version = Constants.VERSION;
+        build_version_info = Constants.VERSION_INFO;
+
+        program_name = "Cable";
+        exec_name = "cable";
+
+        app_years = "2012-2013";
+        app_icon = "internet-chat";
+        app_launcher = "cable.desktop";
+        //application_id = "net.launchpad.cable";
+
+        main_url = "https://code.launchpad.net/cable";
+        bug_url = "https://bugs.launchpad.net/cable";
+        help_url = "https://answers.launchpad.net/cable";
+        translate_url = "https://translations.launchpad.net/cable";
+
+        about_authors = {"Tom Beckmann <[e-mail]>", "Akshay Shekher <[e-mail]", "Julien Spautz <[e-mail]"};
+        about_documenters = {"Tom Beckmann <[e-mail]>"};
+        about_artists = {"Harvey Cabaguio <[e-mail]"};
+        about_comments = "Development release, not all features implemented";
+        about_translators = "Launchpad Translators";
+        about_license_type = Gtk.License.GPL_3_0;
+    }
+
+    public App () {
+        Granite.Services.Logger.initialize ("Cable");
+        Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+    }
+
+    public override void activate () {
+        var window = new Cable.Window (this);
+        this.add_window (window);
+        window.show ();
+    }
+
+    static const OptionEntry[] entries = {
+        { null }
+        // version
+        // reset - reset all settings
+    };
+
+    public static int main (string[] args) {
+        var context = new OptionContext ("File");
+        context.add_main_entries (entries, Constants.GETTEXT_PACKAGE);
+
+        try {
+            context.parse (ref args);
+        }
+        catch (Error e) {
+            print (e.message + "\n");
+        }
+
+        var cable = new Cable.App ();
+        return cable.run (args);
+    }
+}
+

=== modified file 'src/Config.vala.cmake'
--- src/Config.vala.cmake	2013-05-16 13:18:25 +0000
+++ src/Config.vala.cmake	2013-06-28 19:09:26 +0000
@@ -16,11 +16,11 @@
 //
 
 namespace Constants {
-public const string DATADIR = "@DATADIR@";
-public const string PKGDATADIR = "@PKGDATADIR@";
-public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-public const string RELEASE_NAME = "@RELEASE_NAME@";
-public const string VERSION = "@VERSION@";
-public const string VERSION_INFO = "@VERSION_INFO@";
-public const string PLUGINDIR = "@PLUGINDIR@";
+    public const string DATADIR = "@DATADIR@";
+    public const string PKGDATADIR = "@PKGDATADIR@";
+    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    public const string RELEASE_NAME = "@RELEASE_NAME@";
+    public const string VERSION = "@VERSION@";
+    public const string VERSION_INFO = "@VERSION_INFO@";
+    public const string PLUGINDIR = "@PLUGINDIR@";
 }

=== added directory 'src/Dialogs'
=== added file 'src/Dialogs/JoinChannel.vala'
--- src/Dialogs/JoinChannel.vala	1970-01-01 00:00:00 +0000
+++ src/Dialogs/JoinChannel.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,97 @@
+/***
+    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.Dialogs.JoinChannel : Granite.Widgets.LightWindow {
+
+    public signal void done (Settings.Network network, Settings.Identity identity, string channel);
+
+    public JoinChannel () {
+        this.modal = true;
+        this.window_position = Gtk.WindowPosition.CENTER;
+
+        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;
+
+        // Entries/Comboboxes
+        var server_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Settings.networks.size; i++)
+            server_entry.append (i.to_string (), Settings.networks[i].name);
+        server_entry.active = 0;
+
+        var id_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Settings.identities.size; i++)
+            id_entry.append (i.to_string (), Settings.identities[i].nick_name);
+        id_entry.active = 0;
+
+        var channel_entry = new Gtk.Entry ();
+        channel_entry.secondary_icon_name = "edit-redo-symbolic";
+        
+        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.margin = 6;
+        
+        add (grid);
+        this.title = _("Join Channel");
+        
+        channel_entry.text = "#";
+        channel_entry.grab_focus ();
+        channel_entry.set_position (-1);
+
+        channel_entry.icon_release.connect (() => channel_entry.activate ());
+        channel_entry.activate.connect (() => {
+            Settings.Network network;
+            Settings.Identity identity;
+
+            if (server_entry.active_id == null) {
+                network = new Settings.Network (server_entry.get_active_text ());
+            } else {
+                network = Settings.networks[int.parse (server_entry.active_id)];
+            }
+            
+            if (id_entry.active_id == null) {
+                identity = new Settings.Identity (id_entry.get_active_text ());
+            } else {
+                identity = Settings.identities[int.parse (id_entry.active_id)];
+            }
+            
+            done (network, identity, channel_entry.text);
+            
+            this.destroy ();
+        });
+    }
+}

=== added file 'src/Dialogs/ManageIdentity.vala'
--- src/Dialogs/ManageIdentity.vala	1970-01-01 00:00:00 +0000
+++ src/Dialogs/ManageIdentity.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,117 @@
+/***
+    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.
+***/
+
+/**
+ * Add or edit an identity.
+ */
+public class Cable.Dialogs.ManageIdentity : Granite.Widgets.LightWindow {
+
+    /**
+     * @param identity Resulting identity.
+     */
+    public signal void done (Settings.Identity identity);
+
+    /**
+     * @param identity Identity to be edited or null if you want to create
+     * a new one.
+     */
+    public ManageIdentity (Settings.Identity? identity = null) {
+        this.modal = true;
+        this.window_position = Gtk.WindowPosition.CENTER;
+        
+        var grid = new Gtk.Grid ();
+        grid.margin = 12;
+        grid.column_spacing = 6;
+        grid.row_spacing = 6;
+
+        var nick_name = new Gtk.Entry ();
+        nick_name.placeholder_text = _("displayed in chats");
+        nick_name.width_request = 250;
+        var real_name = new Gtk.Entry ();
+        real_name.placeholder_text = _("your real name");
+        var part_message = new Gtk.Entry ();
+        part_message.placeholder_text = _("displayed when you leave a room");
+
+        grid.attach (new Utils.Label.right (_("Nick Name:")), 0, 0, 1, 1);
+        grid.attach (nick_name, 1, 0, 1, 1);
+        grid.attach (new Utils.Label.right (_("Real Name:")), 0, 1, 1, 1);
+        grid.attach (real_name, 1, 1, 1, 1);
+        grid.attach (new Utils.Label.right (_("Part Message:")), 0, 2, 1, 1);
+        grid.attach (part_message, 1, 2, 1, 1);
+
+        var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+        var apply_button = new Gtk.Button ();
+        apply_button.label = (identity == null) ? _("Add Identity")
+                                                : _("Apply Changes");
+        apply_button.sensitive = (identity != null);
+        
+        var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        button_box.layout_style = Gtk.ButtonBoxStyle.END;
+        button_box.add (cancel_button);
+        button_box.add (apply_button);
+
+        grid.attach (button_box, 0, 3, 2, 1);
+
+        this.add (grid);
+        this.title = (identity == null) ? _("Add Identity")
+                                        : _("Edit Identity");
+
+        if (identity != null) {
+            nick_name.text = identity.nick_name;
+            real_name.text = identity.real_name;
+            part_message.text = identity.part_message;
+        }
+
+        nick_name.changed.connect (() => {
+            apply_button.sensitive = (nick_name.text != "");
+        });
+
+        apply_button.clicked.connect (() => {
+            if (identity == null) {
+                done (create_identity (nick_name.text, real_name.text, part_message.text));
+            } else {
+                identity.real_name = real_name.text.strip ();
+                identity.nick_name = nick_name.text.strip ();
+                identity.part_message = part_message.text.strip ();
+                done (identity);
+            }
+            
+            this.destroy ();
+        });
+        
+        cancel_button.clicked.connect (() => {
+            this.destroy ();
+        });
+    }
+
+    Settings.Identity create_identity (string nick_name, string real_name,
+                                       string part_message)
+        requires (nick_name.strip () != "") {
+
+        if (nick_name.strip () == "")
+            return (Settings.Identity) null;
+
+        if (real_name.strip () == "")
+            real_name = null;
+        if (part_message.strip () == "")
+            part_message = null;
+
+        return new Settings.Identity (nick_name, real_name, part_message);
+    }
+}

=== added file 'src/Dialogs/ManageNetwork.vala'
--- src/Dialogs/ManageNetwork.vala	1970-01-01 00:00:00 +0000
+++ src/Dialogs/ManageNetwork.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,116 @@
+/***
+    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.
+***/
+
+/**
+ * Add or edit a network.
+ */
+public class Cable.Dialogs.ManageNetwork : Granite.Widgets.LightWindow {
+
+    /**
+     * @param network Resulting network.
+     */
+    public signal void done (Settings.Network network);
+
+    /**
+     * @param network Network to be edited or null if you want to create
+     * a new one.
+     */
+    public ManageNetwork (Settings.Network? network = null) {
+        this.modal = true;
+        this.window_position = Gtk.WindowPosition.CENTER;
+        
+        var grid = new Gtk.Grid ();
+        grid.margin = 12;
+        grid.column_spacing = 6;
+        grid.row_spacing = 6;
+
+        var address = new Gtk.Entry ();
+        address.placeholder_text = _("irc.network.net");
+        address.width_request = 250;
+        var name = new Gtk.Entry ();
+        name.placeholder_text = _("display name");
+        var password = new Gtk.Entry ();
+        password.placeholder_text = _("optional");
+
+        grid.attach (new Utils.Label.right (_("Address:")), 0, 0, 1, 1);
+        grid.attach (address, 1, 0, 1, 1);
+        grid.attach (new Utils.Label.right (_("Name:")), 0, 1, 1, 1);
+        grid.attach (name, 1, 1, 1, 1);
+        grid.attach (new Utils.Label.right (_("Password:")), 0, 2, 1, 1);
+        grid.attach (password, 1, 2, 1, 1);
+
+        var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+        var apply_button = new Gtk.Button ();
+        apply_button.label = (network == null) ? _("Add Network")
+                                                : _("Apply Changes");
+        apply_button.sensitive = (network != null);
+        
+        var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        button_box.layout_style = Gtk.ButtonBoxStyle.END;
+        button_box.add (cancel_button);
+        button_box.add (apply_button);
+
+        grid.attach (button_box, 0, 3, 2, 1);
+
+        this.add (grid);
+        this.title = (network == null) ? _("Add Network")
+                                        : _("Change Network");
+
+        if (network != null) {
+            address.text = network.address;
+            name.text = network.name;
+            password.text = network.password;
+        }
+
+        address.changed.connect (() => {
+            apply_button.sensitive = (address.text != "");
+        });
+
+        apply_button.clicked.connect (() => {
+            if (network == null) {
+                done (create_network (address.text, name.text, password.text));
+            } else {
+                network.address = address.text.strip ();
+                network.name = name.text.strip ();
+                network.password = password.text.strip ();
+                done (network);
+            }
+            this.destroy ();
+        });
+        
+        cancel_button.clicked.connect (() => {
+            this.destroy ();
+        });
+    }
+
+    Settings.Network create_network (string address, string name,
+                                       string password)
+        requires (address.strip () != "") {
+
+        if (address.strip () == "")
+            return (Settings.Network) null;
+
+        if (name.strip () == "")
+            name = null;
+        if (password.strip () == "")
+            password = null;
+
+        return new Settings.Network (address, name, password);
+    }
+}

=== added file 'src/Dialogs/Preferences.vala'
--- src/Dialogs/Preferences.vala	1970-01-01 00:00:00 +0000
+++ src/Dialogs/Preferences.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,214 @@
+/***
+    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.Dialogs.Preferences : Granite.Widgets.LightWindow {
+
+    public Preferences () {
+        this.window_position = Gtk.WindowPosition.CENTER;
+
+        var static_notebook = new Granite.Widgets.StaticNotebook (false);
+        static_notebook.margin = 12;
+        static_notebook.expand = true;
+        static_notebook.append_page (new NetworkPrefs (), new Gtk.Label (_("Networks")));
+        static_notebook.append_page (new IdentityPrefs (), new Gtk.Label (_("Identities")));
+
+        this.add (static_notebook);
+    }
+}
+
+public class Cable.Dialogs.NetworkPrefs : Gtk.Grid {
+
+    public NetworkPrefs () {
+        var tree = new Gtk.TreeView ();
+        var scroll = new Gtk.ScrolledWindow(null, null);
+
+        sync (tree);
+
+        var cell = new Gtk.CellRendererText ();
+        tree.insert_column_with_attributes (-1, "Name", cell, "text", 0);
+        tree.insert_column_with_attributes (-1, "Address", cell, "text", 1);
+
+        scroll.set_size_request (300, 300);
+        scroll.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+        scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+        scroll.shadow_type = Gtk.ShadowType.IN;
+        scroll.expand = true;
+        scroll.add (tree);
+
+        var toolbar = new Gtk.Toolbar();
+        toolbar.set_style(Gtk.ToolbarStyle.ICONS);
+        toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
+        toolbar.set_show_arrow(false);
+        toolbar.hexpand = true;
+
+        scroll.get_style_context().set_junction_sides(Gtk.JunctionSides.BOTTOM);
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        toolbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
+
+        var add_button    = new Gtk.ToolButton (null, _("Add…"));
+        var remove_button = new Gtk.ToolButton (null, _("Remove"));
+
+        add_button.set_tooltip_text (_("Add…"));
+        remove_button.set_tooltip_text (_("Remove"));
+
+        add_button.set_icon_name ("list-add-symbolic");
+        remove_button.set_icon_name ("list-remove-symbolic");
+
+        toolbar.insert (add_button, -1);
+        toolbar.insert (remove_button, -1);
+
+        this.attach (scroll, 0, 0, 1, 1);
+        this.attach (toolbar, 0, 1, 1, 1);
+
+        add_button.clicked.connect (() => {
+            var dialog = new Dialogs.ManageNetwork ();
+            dialog.done.connect ((network) => {
+                Settings.networks.add (network);
+                this.sync (tree);
+            });
+            dialog.show_all ();
+        });
+
+        remove_button.clicked.connect (() => {
+            Gtk.TreePath? path;
+            tree.get_cursor (out path, null);
+
+            if (path == null)
+                return;
+
+            var index = path.get_indices ()[0];
+            Settings.networks.remove (Settings.networks[index]);
+            sync (tree);
+        });
+
+        tree.row_activated.connect ((path) => {
+            var index = path.get_indices ()[0];
+            var dialog = new Dialogs.ManageNetwork (Settings.networks[index]);
+            dialog.done.connect (() => {
+                //Settings.networks[index] = network;
+                this.sync (tree);
+            });
+            dialog.show_all ();
+        });
+    }
+
+    private void sync (Gtk.TreeView tree) {
+        var store = new Gtk.ListStore (2, typeof (string), typeof (string));
+
+        Gtk.TreeIter iter;
+
+        foreach (var network in Settings.networks) {
+            store.append (out iter);
+            store.set (iter, 0, network.name, 1, network.address, -1);
+        }
+
+        tree.model = store;
+    }
+}
+
+ public class Cable.Dialogs.IdentityPrefs : Gtk.Grid {
+
+    public IdentityPrefs () {
+        var store = new Gtk.ListStore (2, typeof (string), typeof (string));
+        var tree = new Gtk.TreeView ();
+        var scroll = new Gtk.ScrolledWindow(null, null);
+
+        sync (tree);
+
+        var cell = new Gtk.CellRendererText ();
+        tree.insert_column_with_attributes (-1, "Nick", cell, "text", 0);
+        tree.insert_column_with_attributes (-1, "Real Name", cell, "text", 1);
+
+        scroll.set_size_request (300, 300);
+        scroll.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+        scroll.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
+        scroll.shadow_type = Gtk.ShadowType.IN;
+        scroll.expand = true;
+        scroll.add (tree);
+
+        var toolbar = new Gtk.Toolbar();
+        toolbar.set_style(Gtk.ToolbarStyle.ICONS);
+        toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
+        toolbar.set_show_arrow(false);
+        toolbar.hexpand = true;
+
+        scroll.get_style_context().set_junction_sides(Gtk.JunctionSides.BOTTOM);
+        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        toolbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
+
+        var add_button    = new Gtk.ToolButton (null, _("Add"));
+        var remove_button = new Gtk.ToolButton (null, _("Remove"));
+
+        add_button.set_tooltip_text (_("Add"));
+        remove_button.set_tooltip_text (_("Remove"));
+
+        add_button.set_icon_name ("list-add-symbolic");
+        remove_button.set_icon_name ("list-remove-symbolic");
+
+        toolbar.insert (add_button, -1);
+        toolbar.insert (remove_button, -1);
+
+        this.attach (scroll, 0, 0, 1, 1);
+        this.attach (toolbar, 0, 1, 1, 1);
+
+        add_button.clicked.connect (() => {
+            var dialog = new Dialogs.ManageIdentity ();
+            dialog.done.connect ((identitie) => {
+                Settings.identities.add (identitie);
+                this.sync (tree);
+            });
+            dialog.show_all ();
+        });
+
+        remove_button.clicked.connect (() => {
+            Gtk.TreePath? path;
+            tree.get_cursor (out path, null);
+
+            if (path == null)
+                return;
+
+            var index = path.get_indices ()[0];
+            Settings.identities.remove (Settings.identities[index]);
+            sync (tree);
+        });
+
+        tree.row_activated.connect ((path) => {
+            var index = path.get_indices ()[0];
+            var dialog = new Dialogs.ManageIdentity (Settings.identities[index]);
+            dialog.done.connect (() => {
+                //Settings.identities[index] = id;
+                this.sync (tree);
+            });
+            dialog.show_all ();
+        });
+    }
+
+    private void sync (Gtk.TreeView tree) {
+        var store = new Gtk.ListStore (2, typeof (string), typeof (string));
+
+        Gtk.TreeIter iter;
+
+        foreach (var identity in Settings.identities) {
+            store.append (out iter);
+            store.set (iter, 0, identity.nick_name, 1, identity.real_name, -1);
+        }
+
+        tree.model = store;
+    }
+}

=== removed file 'src/Global.vala'
--- src/Global.vala	2013-05-29 00:24:15 +0000
+++ src/Global.vala	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-namespace Cable {
-
-    public class Global : Object {
-
-        public string user_nick { get; set; }
-
-        Global () {
-        }
-
-        static Global? instance;
-        
-        public static Global get_default () {
-            if (instance == null)
-                instance = new Global ();
-            return instance;
-        }
-    }
-}
\ No newline at end of file

=== added directory 'src/Services'
=== added file 'src/Services/Client.vala'
--- src/Services/Client.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Client.vala	2013-06-28 19:09:26 +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.
+ *
+ * TODO document each function or take the actual documentation, if it exists
+ */
+[DBus (name = "de.ikkoku.sushi", timeout = 120000)]
+private interface Cable.Services.Client : 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;
+
+    [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;
+
+    [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/Services/Identity.vala'
--- src/Services/Identity.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Identity.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,123 @@
+/***
+    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 stores one identity and provides some convenience over a
+ * simple struct.
+ */
+public class Cable.Settings.Identity : GLib.Object {
+
+    /**
+     * Nick name displayed to other users.
+     */
+    public string nick_name { get; construct set; }
+
+    /**
+     * Real name, can be anything pretty much.
+     */
+    public string real_name { get; construct set; }
+
+    /**
+     * ...
+     */
+    public string user_name { get; construct set; }
+
+    /**
+     * Message displayed when leaving a channel.
+     */
+    public string part_message { get; construct set; }
+
+    /**
+     * Message send in reply to a private message when marked away.
+     */
+    public string away_message { get; construct set; }
+
+    /**
+     * Message displayed when quitting a server.
+     */
+    public string quit_message { get; construct set; }
+
+    /**
+     * List of all identities.
+     */
+    public static Utils.Array <Identity> all { get; private set; }
+
+    /**
+     * Create a new identity, only the nick name is required.
+     */
+    public Identity (string nick_name,
+                     string? real_name = null,
+                     string? user_name = null,
+                     string? part_message = null,
+                     string? away_message = null,
+                     string? quit_message = null)
+        // TODO check for invalid characters and stuff
+        requires (/^[a-z_\-\[\]\\^{}|`][a-z0-9_\-\[\]\\^{}|`]*$/i.match (nick_name)) {
+
+        this.nick_name = nick_name;
+        this.real_name = real_name ?? nick_name;
+        this.part_message = part_message ?? _("Bye.");
+        this.quit_message = quit_message ?? _("Quit server.");
+        this.away_message = away_message ?? _("%s is away.").printf (nick_name);
+        
+        this.all.add (this);
+        this.notify.connect (() => Settings.identities.changed ());
+    }
+    
+    ~Identity () {
+        this.all.remove (this);
+    }
+    
+    public static void init () {
+        if (all != null)
+            return;
+            
+        all = new Utils.Array <Identity> ();
+        
+        foreach (var identity in settings.get_strv ("identities")) {
+            var values = identity.split (":");
+
+            if (values.length != 3) {
+                warning ("Invalid identity settings");
+                continue;
+            }
+
+            new Settings.Identity (values[0], values[1], values[2]);
+        }
+        
+        all.changed.connect (() => {
+            string[] ids = {};
+
+            foreach (var id in all)
+                ids += string.join (":", id.nick_name, id.real_name, id.part_message);
+
+            settings.set_strv ("identities", ids);
+        });
+    }
+    
+    /**
+     * Creates the default identity from your current login.
+     *
+     * @returns Default identity.
+     */
+    public static Identity get_default () {
+        // TODO
+        return new Identity ("default");
+    }
+}

=== added file 'src/Services/Network.vala'
--- src/Services/Network.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Network.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,103 @@
+/***
+    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 network. All used networks must be contained in Settings.networks,
+ * changes to this class will emit the Settings.networks.changed () signal.
+ */
+ 
+public class Cable.Settings.Network : GLib.Object {
+
+    /**
+     * The address of the network, i.e., "irc.freenode.net"
+     */
+    public string address { get; construct set; }
+    
+    /**
+     * A name to display to the user when selecting a network for instance.
+     */
+    public string name { get; construct set; }
+    
+    /**
+     * Password, defaults to "" if it isn't required.
+     */
+    public string password { get; construct set; }
+    
+    /**
+     * Array of all networks. Checked for duplicates.
+     */
+    public static Utils.Array <Network> all { get; private set; }
+
+    
+    public Network (string address, string? name = null, string? password = null)
+        requires (address.split (".").length == 3) {
+        
+        this.address = address;
+        this.name = name ?? address.split (".")[1];
+        this.password = password ?? "";
+        
+        this.all.add (this);
+        this.notify.connect (() => Settings.networks.changed ());
+    }
+    
+    ~Network () {
+        this.all.remove (this);
+    }
+    
+    public static void init () {
+        if (all != null)
+            return;
+            
+        all = new Utils.Array <Network> ();
+        
+        foreach (var network in settings.get_strv ("networks")) {
+            var values = network.split (":");
+
+            if (values.length != 3) {
+                warning ("Invalid network settings");
+                continue;
+            }
+
+            new Settings.Network (values[0], values[1], values[2]);
+        }
+
+        networks.changed.connect (() => {
+            string[] networks = {};
+
+            foreach (var network in all)
+                networks += string.join (":", network.address, network.name, network.password);
+
+            settings.set_strv ("networks", networks);
+        });
+    }
+    
+    /**
+     * 
+     */
+    public bool is_duplicate (string address, string? name = null) {
+        foreach (var network in all) {
+            if (network.address == address)
+                return false;
+            if (network.name == name)
+                return false;
+        }
+        
+        return true;
+    }
+}

=== added file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Settings.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,146 @@
+/***
+    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.
+***/
+
+/**
+ * Pseudo static class for dealing with gsettings.
+ *
+ * How this works:
+ *
+ * All settings are stored as public and static members of this class.
+ * On startup they are read from gsettings. They can be modified in several
+ * ways (Through the user interface, through gsettings, by the program
+ * itself…). The settings will then emit a "changed" signal, so the change
+ * can be immediately propagated to the server, gsettings, the UI and so
+ * on.
+ */
+namespace Cable.Settings {
+
+    public GLib.Settings settings;
+
+    public Utils.Array <Network> networks;
+    public Utils.Array <Identity> identities;
+    
+    /**
+     * Load values from gsettings.
+     */
+    public static void init () {
+        settings = new GLib.Settings ("org.pantheon.cable");
+        
+        Network.init ();
+        networks = Network.all;
+        
+        Identity.init ();
+        identities = Identity.all;
+    }
+}
+ 
+ /*
+class Cable.Settings : GLib.Object {
+
+    public static Array <Services.Identity> identities;
+    public static Array <Services.Network> networks;
+
+    static string[] _chans;
+    public static string[] channels {
+        get { return _chans = settings.get_strv ("channels"); }
+        set { settings.set_strv ("channels", _chans = value); }
+    }
+
+    private static GLib.Settings settings;
+
+    public static void init () {
+        settings = new GLib.Settings ("org.pantheon.cable");
+
+        identities = new Array <Services.Identity> ();
+        networks = new Array <Services.Network> ();
+
+        foreach (var id in settings.get_strv ("identities")) {
+            var values = id.split (":");
+
+            if (values.length != 3)
+                warning ("Invalid identity settings");
+
+            identities.add (
+                new Services.Identity (values[0], values[1], values[2])
+            );
+        }
+
+        identities.changed.connect (() => {
+            string[] ids = {};
+
+            foreach (var id in identities)
+                ids += string.join (":", id.nick_name, id.real_name, id.part_message);
+
+            settings.set_strv ("identities", ids);
+        });
+
+        foreach (var nw in settings.get_strv ("networks")) {
+            var values = nw.split (":");
+
+            if (values.length != 3) {
+                warning ("Invalid network settings");
+                continue;
+            }
+
+            networks.add (
+                new Services.Network (values[0], values[1], values[2])
+            );
+        }
+
+        networks.changed.connect (() => {
+            string[] nws = {};
+
+            foreach (var nw in networks)
+                nws += string.join (":", nw.address, nw.name, nw.password);
+
+            settings.set_strv ("networks", nws);
+        });
+    }
+
+    private Settings () {
+    }
+}
+
+public class Cable.Array <G> : Gee.ArrayList <G> {
+
+    public signal void changed ();
+
+    public override bool add (G item) {
+        var ret = base.add (item);
+        changed ();
+        return ret;
+    }
+
+     public override bool remove (G item) {
+        var ret = base.remove (item);
+        changed ();
+        return ret;
+    }
+
+     public override G remove_at (int index) {
+        var ret = base.remove_at (index);
+        changed ();
+        return ret;
+    }
+
+    public override void @set (int index, G item) {
+        base.set (index, item);
+        changed ();
+    }
+}*/

=== removed file 'src/Settings.vala'
--- src/Settings.vala	2013-05-29 00:24:15 +0000
+++ src/Settings.vala	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-namespace Cable {
-
-    public class Settings : Granite.Services.Settings {
-
-        public string[] servers { get; set; }
-        public string nick { get; set; }
-        public string[] channels { get; set; }
-        public string real_name { get; set; }
-        public string login_name { get; set; }
-
-        static Settings? instance;
-
-        Settings () {
-            base ("org.pantheon.cable");
-        }
-
-        public static Settings get_default () {
-            if (instance == null)
-                instance = new Settings ();
-            return instance;
-        }
-    }
-}

=== added file 'src/Utils.vala'
--- src/Utils.vala	1970-01-01 00:00:00 +0000
+++ src/Utils.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,69 @@
+/***
+    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.
+***/
+
+class Cable.Utils.Label : Gtk.Label {
+
+    public Label (string text) {
+        label = text;
+        halign = Gtk.Align.START;
+    }
+
+    public Label.right (string text) {
+        label = text;
+        halign = Gtk.Align.END;
+        valign = Gtk.Align.CENTER;
+    }
+}
+
+public class Cable.Utils.Array <G> : Gee.ArrayList <G> {
+
+    public signal void changed ();
+
+    public override bool add (G item) {
+        var ret = base.add (item);
+        changed ();
+        return ret;
+    }
+
+     public override bool remove (G item) {
+        var ret = base.remove (item);
+        changed ();
+        return ret;
+    }
+
+     public override G remove_at (int index) {
+        var ret = base.remove_at (index);
+        changed ();
+        return ret;
+    }
+
+    public override void @set (int index, G item) {
+        base.set (index, item);
+        changed ();
+    }
+}
+
+// FIXME
+namespace Cable.Utils {
+    public void filter (Gtk.Editable editable, string text, string[] needles) {
+        foreach (var needle in needles)
+            if (needle in text)
+                Signal.stop_emission_by_name (editable, "insert-text");
+    }
+}

=== modified file 'src/Widgets/Channel.vala'
--- src/Widgets/Channel.vala	2013-05-29 18:15:05 +0000
+++ src/Widgets/Channel.vala	2013-06-28 19:09:26 +0000
@@ -1,58 +1,112 @@
-namespace Cable.Widgets {
-
-    /**
-     * This class represents a channel and owns the Widgets.Room
-     * associated to its channel.
-     */
-    public class Channel : Granite.Widgets.SourceList.Item {
-
-        /**
-         * Get the room object.
-         */
-        public Room room { get; private set; }
-
-        public Server server {
-            get { return parent as Server; }
-        }
-
-        doodleIRC.DoodleIRCServer backend_server;
-
-        // context menu
-        Gtk.Menu menu;
-        Gtk.MenuItem leave_menu_item;
-        Gtk.MenuItem away_menu_item;
-
-        public Channel (string channel, doodleIRC.DoodleIRCServer backend_server) {
-            this.name = channel;
-            this.backend_server = backend_server;
-            this.room = new Room (channel);
-            
-            this.menu = new Gtk.Menu ();
-            this.leave_menu_item = new Gtk.MenuItem.with_label (_("Leave Channel"));
-            this.away_menu_item = new Gtk.MenuItem.with_label (_("Mark Away"));
-            menu.append (leave_menu_item);
-            menu.append (new Gtk.SeparatorMenuItem ());
-            menu.append (away_menu_item);
-            
-            leave_menu_item.activate.connect (() => {
-                server.leave_channel (name);
-            });
-            away_menu_item.activate.connect (() => {
-                backend_server.toggle_away (_("Away"));
-            });
-        }
+/***
+    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 channel and owns the Widgets.Room
+ * associated to its channel.
+ */
+public class Cable.Widgets.Channel : Granite.Widgets.SourceList.Item {
+
+    /**
+     * Get the room object.
+     */
+    public Room room { get; private set; }
+
+    /**
+     * The server this channel belongs to.
+     */
+    public Server server {
+        get { return parent as Server; }
+    }
+
+    // context menu
+    Gtk.Menu menu;
+    Gtk.MenuItem leave_menu_item;
+    Gtk.MenuItem away_menu_item;
+
+    public Channel (string channel_name) {
+        this.name = channel_name;
+        this.room = new Room (channel_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 ();
         
-        public void list_names (string[] names) {
-            foreach (var name in names) {
-                room.add_user (name, 0);
-                debug ("Listing name: %s", name);
+        leave_menu_item.activate.connect (() => {
+            server.leave_channel (name);
+        });
+    }
+
+    /**
+     * Add names to the source list.
+     *
+     * @prefix names Array of names to add.
+     * @prefix prefixes Array of corresponding prefixes.
+     */
+    public void list_names (string[] names, string[] prefixes) {
+        UserType user_type = UserType.REGULAR;
+
+        for (int i = 0; i < names.length; i++) {
+            switch (prefixes[i]) {
+                case "@":
+                    user_type = UserType.OPERATOR;
+                    break;
+                case "+":
+                    user_type = UserType.VOICED;
+                    break;
+                default:
+                    user_type = UserType.REGULAR;
+                    break;
             }
-        }
-        
-        public override Gtk.Menu? get_context_menu () {
-            menu.show_all ();
-            return menu;
-        }
-    }
-
+
+            room.add_user (names[i], user_type, true);
+        }
+    }
+
+    /**
+     * Tell the room widget that a new user has been added.
+     *
+     * @param name The user's nickname (including @ or + prefix).
+     * @param silent If true, don't display a join message.
+     */
+    public void add_user (string name, bool silent = false) {
+        if (name.has_prefix ("@"))
+            room.add_user (name.replace ("@", ""), UserType.OPERATOR, silent);
+        else if (name.has_prefix ("+"))
+            room.add_user (name.replace ("+", ""), UserType.VOICED, silent);
+        else
+            room.add_user (name, UserType.REGULAR, silent);
+    }
+
+    /**
+     * Remove a user from the sidebar and display a leave message.
+     *
+     * @param name The users nickname without prefix.
+     */
+    public void remove_user (string name) {
+        room.remove_user (name);
+    }
+
+    public override Gtk.Menu? get_context_menu () {
+        if (menu != null && menu.get_attach_widget () != null)
+            menu.detach ();
+        return menu;
+    }
 }

=== modified file 'src/Widgets/Room.vala'
--- src/Widgets/Room.vala	2013-06-10 18:12:26 +0000
+++ src/Widgets/Room.vala	2013-06-28 19:09:26 +0000
@@ -1,32 +1,213 @@
-namespace Cable.Widgets {
-
-    public enum UserType {
-        OPERATOR,
-        VOICED,
-        REGULAR
-    }
-
-    public enum MessageType {
-        NORMAL,
-        ENTER,
-        LEAVE
-    }
-
-    /**
-     * 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 Room : Gtk.Box {
-
-        Granite.Widgets.SourceList.ExpandableItem operators;
-        Granite.Widgets.SourceList.ExpandableItem voiced;
-        Granite.Widgets.SourceList.ExpandableItem regular;
-
-        Granite.Widgets.SourceList users;
-        Gtk.TreeView chat;
-        Gtk.ScrolledWindow left_scrolled;
+/***
+    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.Widgets.UserType {
+    OPERATOR,
+    VOICED,
+    REGULAR
+}
+
+public enum Cable.Widgets.MessageType {
+    NORMAL,
+    ENTER,
+    LEAVE,
+    NICK,
+    AWAY
+}
+
+/**
+ * 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.Widgets.Room : Gtk.Box {
+
+    Granite.Widgets.SourceList.ExpandableItem operators;
+    Granite.Widgets.SourceList.ExpandableItem voiced;
+    Granite.Widgets.SourceList.ExpandableItem regular;
+
+    Granite.Widgets.SourceList users;
+    Gtk.TreeView chat;
+    Gtk.ScrolledWindow left_scrolled;
+
+
+    Gtk.Menu menu;
+    Gtk.MenuItem kick_item;
+    Gtk.MenuItem ban_item;
+    Gtk.MenuItem ignore_item;
+
+    public Gtk.InfoBar topic;
+    public Gtk.Label topic_name;
+
+    public signal void send_message (string message);
+
+    public signal bool kick_user (string nick_name);
+    public signal bool ban_user (string nick_name);
+    public signal void ignore (string nick_name, bool ignore = true);
+
+    public Room (string channel) {
+    
+        //var web_view = new WebKit.WebView ();
+    
+        this.orientation = Gtk.Orientation.VERTICAL;
+        var paned = new Granite.Widgets.ThinPaned ();
+        var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        users = new Granite.Widgets.SourceList ();
+        var entry = new Gtk.Entry ();
+        chat = new Gtk.TreeView.with_model (new Gtk.ListStore (2, typeof(string), typeof(string)));
+        var topic = new Gtk.InfoBar ();
+        topic_name = new Gtk.Label (_("Loading Topic…"));
+        topic_name.wrap = true;
+        var bottom = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        left_scrolled = new Gtk.ScrolledWindow (null, null);
+        //var user = new Gtk.Button.with_label (Global.get_default ().user_nick);
+
+        var left = new Gtk.CellRendererText ();
+        left.xalign = 1.0f;
+        left.width = 90;
+        left.font_desc = Pango.FontDescription.from_string (
+            new GLib.Settings ("org.gnome.desktop.interface").get_string ("document-font-name"));
+
+        var right = new Gtk.CellRendererText ();
+        right.wrap_mode = Pango.WrapMode.WORD_CHAR;
+        right.wrap_width = -1;
+        right.font_desc = left.font_desc;
+
+        chat.enable_grid_lines = Gtk.TreeViewGridLines.VERTICAL;
+        chat.headers_visible = false;
+        chat.insert_column_with_attributes (-1, null, left, "markup", 0);
+        chat.insert_column_with_attributes (-1, null, right, "markup", 1);
+        chat.button_press_event.connect (() => true );
+
+        var css = new Gtk.CssProvider ();
+        try {
+            css.load_from_data ("* {
+                -GtkTreeView-grid-line-pattern: '1';
+            }", -1);
+        } catch (Error e) { warning (e.message); }
+
+        chat.get_style_context ().add_provider (css, 40000);
+        topic_name.halign = Gtk.Align.FILL;
+        topic_name.valign = Gtk.Align.FILL;
+
+        var content = topic.get_content_area () as Gtk.Container;
+        content.add (topic_name);
+
+        operators = new Granite.Widgets.SourceList.ExpandableItem (_("Operators"));
+        regular = new Granite.Widgets.SourceList.ExpandableItem ("Regular");
+        voiced = new Granite.Widgets.SourceList.ExpandableItem ("Voiced");
+        users.root.add (operators);
+        users.root.add (voiced);
+        users.root.add (regular);
+        users.set_sort_func ((a,b) => {
+            return a.name.collate (b.name);
+        });
+
+        operators.expanded = true;
+        regular.expanded = true;
+        voiced.expanded = true;
+
+        css = new Gtk.CssProvider ();
+        try {
+            css.load_from_data ("*{
+                background-color: #fff;
+            }", -1);
+        } catch (Error e) { warning (e.message); }
+        users.get_style_context ().add_provider (css, 40000);
+
+        users.hscrollbar_policy = Gtk.PolicyType.NEVER;
+        users.width_request = 150;
+
+
+        paned.pack1 (box, true, false);
+        paned.pack2 (users, false, false);
+
+        /*user.width_request = 99;
+        user.margin_right = 5;
+        user.xalign = 1.0f;*/
+
+
+        css = new Gtk.CssProvider ();
+        try {
+            css.load_from_data ("*{
+                background-image: none;
+                background-color: transparent;
+                -unico-inner-stroke-width: 0px;
+                -unico-outer-stroke-width: 0px;
+                border-left: 1px solid #666;
+                border-width: 0px 0px 0px 1px;
+            }
+            *:active, *:prelight {
+                border-color: #666;
+            }", -1);
+        } catch (Error e) { warning (e.message); }
+        entry.get_style_context ().add_provider (css, 40000);
+
+        //bottom.pack_start (user, false);
+        bottom.pack_start (entry);
+
+        left_scrolled.add (chat);
+
+        box.pack_start (topic, false);
+        box.pack_start (left_scrolled);
+        //box.pack_start (bottom, false);
+
+        this.pack_start (paned);
+
+        /*user.clicked.connect (() => {
+
+            var settings_dialog = new Widgets.SettingsDialog ();
+
+            settings_dialog.show_all ();
+            //settings_dialog.run ();
+
+        });*/
+
+        entry.activate.connect (() => {
+            send_message (entry.text);
+            entry.text = "";
+        });
+
+        bottom.draw.connect ((cr) => {
+            var grad = new Cairo.Pattern.linear (0, 0, 0, bottom.get_allocated_height () - 4);
+            grad.add_color_stop_rgb (0.0, 0.9, 0.9, 0.9);
+            grad.add_color_stop_rgb (1.0, 1.0, 1.0, 1.0);
+            cr.rectangle (0, 0, bottom.get_allocated_width (), bottom.get_allocated_height ());
+            cr.set_source (grad);
+            cr.fill ();
+
+            cr.move_to (0, 0);
+            cr.line_to (this.get_allocated_width (), 0);
+            cr.close_path ();
+            cr.set_source_rgba (0.1, 0.1, 0.1, 1.0);
+            cr.set_line_width (1);
+            cr.stroke ();
+
+            return false;
+        });
+    }
+
+    public void rename_user (string old_name, string new_name, UserType type, bool silent = false) {
+        remove_user (old_name, true);
+        add_user (new_name, type, true);
         
+<<<<<<< TREE
         public Gtk.InfoBar topic;        
         public Gtk.Label topic_name;
 
@@ -175,49 +356,81 @@
             else
                 regular.add (new Granite.Widgets.SourceList.Item (name));
 
+=======
+        if (!silent)
+            message (new_name, "", MessageType.NICK);
+    }
+
+    public void add_user (string name, UserType type, bool silent = false) {
+        var user = new Granite.Widgets.SourceList.Item (name);
+        user.selectable = false;
+
+        if (type == UserType.OPERATOR)
+            operators.add (user);
+        else if (type == UserType.VOICED)
+            voiced.add (user);
+        else
+            regular.add (user);
+
+        if (!silent)
+>>>>>>> MERGE-SOURCE
             message (name, "", MessageType.ENTER);
-        }
-
-        public void remove_user (string name) {
-            Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
-            foreach (var list in lists) {
-                foreach (var child in list.children) {
-                    if (child.name == name) {
-                        list.remove (child);
-
+
+        regular.name = _("Regular") + " (" + regular.n_children.to_string () + ")";
+        operators.name = _("Operators") + " (" + operators.n_children.to_string () + ")";
+        voiced.name = _("Voiced") + " (" + voiced.n_children.to_string () + ")";
+    }
+
+    public void remove_user (string name, bool silent = false) {
+        Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
+        foreach (var list in lists) {
+            foreach (var child in list.children) {
+                if (child.name == name) {
+                    list.remove (child);
+                    
+                    if (!silent)
                         message (child.name, "", MessageType.LEAVE);
-
-                        return;
-                    }
-
+                    
+                    regular.name = _("Regular") + " (" + regular.n_children.to_string () + ")";
+                    operators.name = _("Operators") + " (" + operators.n_children.to_string () + ")";
+                    voiced.name = _("Voiced") + " (" + voiced.n_children.to_string () + ")";
+                    
                     return;
                 }
             }
         }
-
-        public void message (owned string from, string message, MessageType type=MessageType.NORMAL) {
-            bool do_scroll = left_scrolled.vadjustment.value + 10 > left_scrolled.vadjustment.upper;
-
-            Gtk.TreeIter iter;
-            (chat.model as Gtk.ListStore).append (out iter);
-
-            if (type == MessageType.NORMAL) {
-
-                if (from == Global.get_default ().user_nick)
-                    from = "<span color='#999'>"+from+"</span>";
-                else if (message.index_of (Global.get_default ().user_nick) != -1)
-                    from = "<span color='#a00'>"+from+"</span>";
-
-                (chat.model as Gtk.ListStore).set (iter, 0, from, 1, message);
-            } else
-                (chat.model as Gtk.ListStore).set (iter, 0, "",
-                    1, "<span color='#999'>%s has %s the room.</span>".printf (from, type == MessageType.ENTER ? "entered" : "left"));
-
-            Timeout.add (10, () => {
+        
+    }
+
+    public void message (owned string from, string message, MessageType type = MessageType.NORMAL) {
+        bool do_scroll = left_scrolled.vadjustment.value + 10 > left_scrolled.vadjustment.upper;
+
+        Gtk.TreeIter iter;
+        var model = chat.model as Gtk.ListStore;
+        model.append (out iter);
+
+        switch (type) {
+            case MessageType.NORMAL:
+                model.set (iter, 0, from, 1, message);
+                break;
+            case MessageType.ENTER:
+                model.set (iter, 0, "", 1, @"<span color='#9a9'>$from joined</span>");
+                break;
+            case MessageType.LEAVE:
+                model.set (iter, 0, "", 1, @"<span color='#a99'>$from left</span>");
+                break;
+            case MessageType.AWAY:
+                model.set (iter, 0, "", 1, @"<span color='#999'>$from is away</span>");
+                break;
+            case MessageType.NICK:
+                model.set (iter, 0, "", 1, @"<span color='#999'>$from</span>");
+                break;
+        }
+
+        Timeout.add (1, () => {
             if (do_scroll)
                 left_scrolled.vadjustment.value = left_scrolled.vadjustment.upper;
                 return false;
-            });
-        }
+        });
     }
 }

=== modified file 'src/Widgets/Server.vala'
--- src/Widgets/Server.vala	2013-06-06 21:07:29 +0000
+++ src/Widgets/Server.vala	2013-06-28 19:09:26 +0000
@@ -1,233 +1,384 @@
-namespace Cable.Widgets {
-
-    public class Server : Granite.Widgets.SourceList.ExpandableItem {
-
-        //some default servers
-        public static const string [] DEFAULT_SERVERS = {
-            "Freenode", "irc.freenode.net",
-            "GimpNET", "irc.gimp.org"
-        };
-
-        /**
-         * List of all channels of this Server.
-         */
-        GLib.List <Channel> _channels = null;
-        public GLib.List <Channel> channels {
-            get {
-                _channels = new GLib.List <Channel> ();
-                foreach (var child in children)
-                    _channels.append (child as Channel);
-                return _channels;
-           }
-        }
-
-        doodleIRC.DoodleIRCServer backend_server;
-
-        public string uri;
-
-
-        public signal void left_channel (Channel channel);
-        public signal void joined_channel (Channel channel);
-
-        /**
-         * Create and join server.
-         */
-        public Server (string _name, string _uri) {
-            var settings = Settings.get_default ();
-            name = _name;
-            uri = _uri;
-
-            doodleIRC.User user = doodleIRC.User () {
-                realname = settings.real_name,
-                hostname = settings.nick,
-                username = settings.nick,
-                servername = uri
-            };
-
-            backend_server = new doodleIRC.DoodleIRCServer ("irc.freenode.net", user, settings.nick);
-            Global.get_default ().user_nick = settings.nick; //TODO use fallback nicks
-
-            try {
-                backend_server.connect ();
-            } catch (Error e) {
-            //Needs Fixing
-                Gtk.main_quit ();
-            }
-
-            backend_server.on_message.connect ((sender, chan, msg) => {
-               channels.foreach ((channel) => {
-                    if (channel.name == chan) {
-                        channel.room.message (sender, msg);
-                        return;
-                    }
-                });
-
-                critical ("Channel '%s' has not been opened", chan);
-            });
-
-            backend_server.on_names_listed.connect ((chan, names) => {
-                channels.foreach ((channel) => {
-                    if (channel.name == chan)
-                        channel.list_names (names);
-                });
-            });
-        }
-
-        /**
-         * Retrieve a channel by its name
-         */
-        public Channel? get_channel_by_name (string channel_name) {
+/***
+    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.Widgets.Server : Granite.Widgets.SourceList.ExpandableItem {
+
+    /**
+     * List of all channels of this Server.
+     */
+    Gee.ArrayList <Channel> _channels = null;
+    public Gee.ArrayList <Channel> channels {
+        get {
+            _channels = new Gee.ArrayList <Channel> ();
+            foreach (var child in children)
+                _channels.add (child as Channel);
+            return _channels;
+       }
+    }
+
+    /**
+     * Information about the network we are connected to.
+     */
+    public Settings.Network network { get; private set; }
+
+    /**
+     * Information about the identity we are using for this connection.
+     */
+    public Settings.Identity identity { get; private set; }
+
+    Services.Client client = null;
+    string server_id;
+    bool away;
+    bool connected = false;
+    string to_join;
+    // menu
+    Gtk.Menu menu;
+    Gtk.MenuItem away_menu_item;
+    Gtk.MenuItem part_menu_item;
+
+    /**
+     * Emitted when the server emits a PART message for us.
+     *
+     * @param channel Channel that has been parted.
+     */
+    public signal void left_channel (Channel channel);
+
+    /**
+     * Emitted when a server confirms that we have joined successfully.
+     *
+     *  @param channel Channel that has been joined.
+     */
+    public signal void joined_channel (Channel channel);
+
+    /**
+     * Create and connect to a server.
+     */
+    public Server (Settings.Network network, Settings.Identity identity) {
+
+        this.network = network;
+        this.identity = identity;
+        this.name = network.name;
+        this.server_id = string.join (":", network.address, identity.nick_name);
+
+        try {
+            client = GLib.Bus.get_proxy_sync (
+                GLib.BusType.SESSION, "de.ikkoku.sushi", "/de/ikkoku/sushi"
+            );
+        } catch (IOError e) {
+            print (e.message);
+            return;
+        }
+
+        debug ("Successfully connected to Sushi dbus session.\n");
+
+        setup_callbacks ();
+        setup_contextmenu ();
+        setup_settings_callbacks ();
+
+        foreach (var server in client.servers ()) {
+            if (client.server_get (server, "server", "nick") == identity.nick_name &&
+                client.server_get (server, "server", "address") == network.address) {
+
+                debug (@"Already connected to $server.");
+                connected = true;
+                this.server_id = server;
+
+                return;
+            }
+        }
+
+        try {
+            debug (@"Creating new server $server_id.");
+            client.server_set (server_id, "server", "address", network.address);
+            client.server_set (server_id, "server", "nickserv", network.password);
+            client.server_set (server_id, "server", "nick", identity.nick_name);
+            client.server_set (server_id, "server", "name", identity.real_name);
+            client.server_set (server_id, "server", "autoconnect", "true");
+            client.connect (server_id);
+        } catch (GLib.IOError e) {
+            print (e.message);
+            return;
+        }
+ 
+        debug ("Successfully set up server.\n");
+    }
+
+    public override Gtk.Menu? get_context_menu () {
+        if (menu != null && menu.get_attach_widget () != null)
+            menu.detach ();
+        return menu;
+    }
+
+    /**
+     * Create the context menu shown when right clicking a server entry.
+     */
+    private void setup_contextmenu () {
+        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 (() => {
+            if (!away) {
+                client.away (server_id, _("%s is away.").printf (identity.real_name));
+                away_menu_item.label = _("Mark Present");
+            } else {
+                client.away (server_id, _(""));
+                away_menu_item.label = _("Mark Away");
+            }
+        });
+
+        part_menu_item.activate.connect (() => {
             foreach (var channel in channels)
-                if (channel.name == channel_name)
-                    return channel;
-
-            return (Channel) null;
-        }
-
-        /**
-         * Join a channel and return the Widget.Channel object
-         */
-        public Channel? join_channel (string channel_name) {
-            var channel = new Channel (channel_name, backend_server);
-
-            channel.room.send_message.connect ((msg) => {
-                backend_server.write (channel_name, msg);
-            });
-            
-            backend_server.join_chan (channel_name);
-            backend_server.get_topic (channel_name, (channel_name, topic) => {
-                print ("Topic :%s\n".printf (topic));
-                // Set topic
-                channel.room.topic_name.label = topic;
-
-                // Now check for links                TODO async this
-                /*string parsed_topic = topic;
-                bool done = false;
-                int i = 0, start = 0, end = 0, p = 0, counter = 0;
-                Array<string> links = new Array<string> ();
-                start = topic.index_of ( "http", i);
-                while(!done) {
-                    start = topic.index_of ( "http", start);
-                    if ( start == -1) {
-                        // No link
-                        done = true;
-                    } else {
-                        // Contains links
-                        end = topic.index_of ( " ", start);
-                        if ( end == -1) {
-                            // End of topic
-                            end = topic.length;
-                            done = true;
-                        }
-                        print ("URL :%s\n".printf (topic.slice ((long) start, (long) end)));
-                        links.insert_val ( (uint) p, topic.slice ((long) start, (long) end));
-                        print ("URL in Array :%s\n".printf (links.index(p)));
-                        p++;
-                        start = end;
-                    }
+                leave_channel (channel.name);
+        });
+
+        menu.show_all ();
+    }
+
+    /**
+     * Callbacks for the possible server replies.
+     */
+    private void setup_callbacks () {
+
+        // connected
+        client.event_connected.connect ((time, server) => {
+            debug (@"Connected to $server");
+            connected = true;
+            if (to_join != null)
+                join_channel (to_join);
+        });
+
+        // join
+        client.event_join.connect ((time, server, from, chan) => {
+
+            var channel = get_channel_if_valid (server, chan);
+
+            if (channel == null)
+                return;
+
+            var nick = from.split ("!")[0];
+
+            if (nick == identity.nick_name) {
+                debug (@"Joined $chan on $(network.address) as $(identity.nick_name)");
+                setup_channel_callbacks (channel);
+            } else {
+                channel.add_user (nick);
+            }
+        });
+
+        // no such channel
+        client.event_no_such.connect ((time, server, target, type) => {
+            var channel = get_channel_if_valid (server, target);
+
+            if (channel == null)
+                return;
+
+            warning ("No such channel '%s'.", channel.name);
+            remove (channel);
+            left_channel (channel); //signal
+        });
+
+        // topic
+        client.event_topic.connect ((time, server, from, chan, topic) => {
+            var channel = get_channel_if_valid (server, chan);
+
+            if (channel == null)
+                return;
+
+            channel.room.topic_name.label = topic;
+        });
+        
+        
+
+        // names
+        client.event_names.connect ((time, server, chan, nicks, prefixes) => {
+           var channel = get_channel_if_valid (server, chan);
+
+            if (channel == null)
+                return;
+
+            channel.list_names (nicks, prefixes);
+        });
+
+        // part
+        client.event_part.connect ((time, server, from, chan, message) => {
+            var channel = get_channel_if_valid (server, chan);
+
+            if (channel == null)
+                return;
+
+            debug (@"Parted from $chan on $(network.address) as $(identity.nick_name)");
+
+            var nick = from.split ("!")[0];
+
+            if (nick == identity.nick_name) {
+                remove (channel);
+                left_channel (channel); //signal
+            } else {
+                channel.remove_user (nick);
+            }
+        });
+
+        // message
+        client.event_message.connect ((time, server, from, target, message) => {
+            var channel = get_channel_if_valid (server, target);
+
+            if (channel == null)
+                return;
+
+            var nick = from.split ("!")[0];
+
+            channel.room.message (nick, message);
+        });
+
+        // away
+        client.event_user_away.connect ((time, server, from, away) => {
+            if (server != this.server_id)
+                return;
+
+            var nick = from.split ("!")[0];
+
+            debug (@"AWAY $server $nick $away");
+
+            if (nick == identity.nick_name)
+                this.away = away;
+        });
+
+        // nick
+        client.event_nick.connect ((time, server, from, new_nick) => {
+            if (server != this.server_id)
+                return;
+
+            if (identity.nick_name != new_nick)
+                identity.nick_name = new_nick;
+
+            client.server_set (server_id, "server", "nick", identity.nick_name);
+        });
+    }
+
+    /**
+     * Callbacks for GUI signals.
+     */
+    private void setup_channel_callbacks (Channel channel) {
+        channel.room.send_message.connect ((text) => {
+            if (text[0] == '/'){}
+                //TODO client.raw (this.server_id, text.replace ("/", ""));
+            else
+                client.message (this.server_id, channel.name, text);
+        });
+    }
+
+    private void setup_settings_callbacks () {
+        identity.notify["nick-name"].connect (() => {
+            debug ("Sending nick request %s", identity.nick_name);
+            client.nick (this.server_id, identity.nick_name);
+        });
+    }
+
+    private Channel get_channel_if_valid (string server, string chan) {
+        if (server != this.server_id)
+                return (Channel) null;
+
+        var channel = get_channel_by_name (chan);
+
+        if (channel == null)
+            critical ("Channel '%s' has not been opened", chan);
+
+        return channel;
+    }
+
+    public void send_message (Channel channel, string message) {
+        client.message (this.server_id, channel.name, message);
+    }
+
+    /**
+     * Retrieve a channel by its name.
+     *
+     * @param channel_name Name of the channel you are looking for.
+     */
+    public Channel? get_channel_by_name (string channel_name) {
+        foreach (var channel in channels)
+            if (channel.name == channel_name)
+                return channel;
+
+        return (Channel) null;
+    }
+
+    public bool channel_is_joined (string channel_name) {
+        foreach (var channel in channels)
+            if (channel.name == channel_name)
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Join a channel and return the Widget.Channel object.
+     *
+     * @param channel_name Name of the channel to be joined.
+     * @returns The created channel.
+     */
+    public Channel? join_channel (string channel_name) {
+        if (connected == false) {
+        
+            client.event_connected.connect ((time, server) => {
+                if (server == this.server_id) {
+                    connected = true;
+                    join_channel (channel_name);
                 }
-                    
-                    for (counter = 0; counter < p; counter++) {
-                        string parsed = "<a href=\"" + links.index(counter) + "\">" + links.index(counter) + "</a>";
-                        print ("Link :%s\n".printf (links.index(counter)));
-                        print ("Parsed Link :%s\n".printf (parsed));
-                        parsed_topic = parsed_topic.replace (links.index(counter), parsed);
-                    }
-                            
-                channel.room.topic_name.set_use_markup (true);
-                print ("Parsed Topic :%s\n".printf (parsed_topic));
-                channel.room.topic_name.label = parsed_topic;*/
-            });
-            
-            this.add (channel);
-
-            joined_channel (channel); //signal
-
-            return channel;
-        }
-
-        /**
-         * Leave a channel.
-         */
-        public void leave_channel (string channel_name) {
-            var channel = get_channel_by_name (channel_name);
-            backend_server.leave_chan (channel_name);
-            remove (channel);
-            left_channel (channel); // signal
-        }
-
-        public void quit () {
-            backend_server.quit_server ("Quitting:");
-        }
-
-        //builds up a ComboBox offering some default and your custom servers
-        /*modified by Xylon*/
-        public static Gtk.ComboBoxText get_server_list () {
-            var box = new Gtk.ComboBoxText.with_entry ();
-
-            //add the default ones
-            for (var i = 0; i < DEFAULT_SERVERS.length; i += 2) {
-                box.append (DEFAULT_SERVERS[i + 1], DEFAULT_SERVERS[i]);
-            }
-
-            //add the custom ones
-            foreach (var server in Settings.get_default ().servers) {
-                if (server == "")
-                    continue;
-
-                var details = server.split (":");
-                box.append (details[1], details[0]);
-            }
-
-            box.active = 0;
-
-            return box;
-        }
-
-        public static Gtk.Dialog get_add_dialog ()
-        {
-            var dialog = new Gtk.Dialog.with_buttons (_("Add Server"), null, Gtk.DialogFlags.MODAL);
-            var grid = new Gtk.Grid ();
-            var servernamelabel = new Gtk.Label (_("Server Name:"));
-            var serverurllabel = new Gtk.Label (_("Server URL:"));
-            var name = new Gtk.Entry ();
-            var url = new Gtk.Entry ();
-            var add = new Gtk.Button.with_label (_("Add Server"));
-
-            name.placeholder_text = "Server";
-            url.placeholder_text = "irc.server.net";
-            grid.margin = 12;
-            grid.column_spacing = 6;
-            grid.row_spacing = 6;
-
-            grid.attach (servernamelabel, 0, 0, 1, 1);
-            servernamelabel.set_alignment ( 1, 0.5f);
-            grid.attach (name, 1, 0, 1, 1);
-            grid.attach (serverurllabel, 0, 1, 1, 1);
-            serverurllabel.set_alignment ( 1, 0.5f);
-            grid.attach (url, 1, 1, 1, 1);
-            grid.attach (add, 1, 2, 1, 1);
-
-            url.activate.connect (() => add.clicked ());
-
-            add.clicked.connect (() => {
-                var servers = Settings.get_default ().servers;
-                servers.resize (servers.length + 1);
-                servers[servers.length - 1] = name.text + ":" + url.text;
-                Settings.get_default ().servers = servers;
-
-                dialog.destroy ();
-            });
-
-            name.changed.connect (() => add.sensitive = name.text != "" && url.text != "");
-            url.changed.connect  (() => add.sensitive = name.text != "" && url.text != "");
-
-            add.sensitive = false;
-
-            (dialog.get_content_area () as Gtk.Container).add (grid);
-            dialog.title = _("Add Server");
-            
-            return dialog;
-        }
+            });
+            
+            return (Channel) null;
+        }
+        
+        if (channel_is_joined (channel_name)) {
+            warning (@"Channel '$channel_name' already joined.");
+            return (Channel) null;
+        }
+
+        var channel = new Channel (channel_name);
+        this.add (channel);
+
+        client.join (this.server_id, channel_name, "");
+        joined_channel (channel); //signal
+
+        return channel;
+    }
+
+    /**
+     * Send PART message to server.
+     *
+     * @param channel_name Name of the channel you want to leave.
+     */
+    public void leave_channel (string channel_name) {
+        var channel = get_channel_by_name (channel_name);
+        client.part (this.server_id, channel_name, identity.part_message);
+    }
+
+    /**
+     * Quit the server.
+     */
+    public void quit () {
+        client.quit (this.server_id, "Quit.");
     }
 }

=== modified file 'src/Widgets/ServerList.vala'
--- src/Widgets/ServerList.vala	2013-05-29 18:15:05 +0000
+++ src/Widgets/ServerList.vala	2013-06-28 19:09:26 +0000
@@ -1,77 +1,104 @@
-namespace Cable.Widgets {
-
-    /**
-     * This class stores all servers (Widget.Server) of the current window in
-     * a Granite.Widgets.SourceList.
-     */
-    public class ServerList : Granite.Widgets.SourceList {
-
-        /**
-         * List of all servers in the ServerList.
-         */
-        GLib.List <Server> _servers = null;
-        public GLib.List <Server> servers {
-            get {
-                _servers = new GLib.List <Server> ();
-                foreach (var child in root.children)
-                    _servers.append (child as Server);
-                return _servers;
-           }
-        }
-        
-        /**
-         * Get the server of the currently selected channel.
-         */
-        public Server? current_server {
-            get { return selected.parent as Server; }
-        }
-
-        /**
-         * Get the currently selected channel.
-         */
-        public Channel? current_channel {
-            get { return selected as Channel; }
-        }
-
-        /**
-         * Get the currently selected channel's room.
-         */
-        public Room? current_room {
-            get { return current_channel.room as Room; }
-        }
-
-        public ServerList () {
-        }
-        
-        public Server? get_server_by_URI (string URI) {
-            foreach (var server in servers)
-                if (server.uri == URI)
-                    return server;
-            
-            return (Server) null;
-        }
-        
-        /**
-         * Amount of opened servers.
-         */
-        public uint get_n_servers () {
-            return get_n_visible_children (root);
-        }
-
-        /**
-         * Removes and quits a server from the List.
-         */
-        public void remove_server (Server server) {
-            server.quit ();
-            root.remove (server);
-        }
-
-        /**
-         * Add and connect to server.
-         */
-        public void add_server (Server server) {
-            root.add (server);
-        }
-    }
-
+/***
+    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 stores all servers (Widget.Server) of the current window in
+ * a Granite.Widgets.SourceList.
+ */
+public class Cable.Widgets.ServerList : Granite.Widgets.SourceList {
+
+    /**
+     * List of all servers in the ServerList.
+     */
+    Gee.ArrayList <Server> _servers = null;
+    public Gee.ArrayList <Server> servers {
+        get {
+            _servers = new Gee.ArrayList <Server> ();
+            foreach (var child in root.children)
+                _servers.add (child as Server);
+            return _servers;
+       }
+    }
+    
+    /**
+     * Get the server of the currently selected channel.
+     */
+    public Server? current_server {
+        get { return selected.parent as Server; }
+    }
+
+    /**
+     * Get the currently selected channel.
+     */
+    public Channel? current_channel {
+        get { return selected as Channel; }
+    }
+
+    /**
+     * Get the currently selected channel's room.
+     */
+    public Room? current_room {
+        get { return current_channel.room as Room; }
+    }
+    
+    /**
+     * Amount of opened servers.
+     */
+    /*public uint n_servers {
+        get { return get_n_visible_children (root); }
+    }*/
+
+    public ServerList () {
+        width_request = 150;
+    }
+    
+    /**
+     * Returns Server object from server URI or null
+     */
+    public Server? get_server (string URI, string nick) {
+        foreach (var server in servers)
+            if (server.network.address == URI &&
+                server.identity.nick_name == nick)
+                return server;
+        
+        return (Server) null;
+    }
+    
+    /**
+     * Amount of opened servers.
+     */
+    public uint get_n_servers () {
+        return get_n_visible_children (root);
+    }
+
+    /**
+     * Removes and quits a server from the List.
+     */
+    public void remove_server (Server server) {
+        server.quit ();
+        root.remove (server);
+    }
+
+    /**
+     * Add server.
+     */
+    public void add_server (Server server) {
+        root.add (server);
+    }
 }

=== removed file 'src/Widgets/SettingsDialog.vala'
--- src/Widgets/SettingsDialog.vala	2013-06-06 21:07:29 +0000
+++ src/Widgets/SettingsDialog.vala	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-
-namespace Cable.Widgets {
-
-    class LLabel : Gtk.Label {
-
-        public LLabel (string text) {
-            label = text;
-            halign = Gtk.Align.START;
-        }
-
-        public LLabel.right (string text) {
-            label = text;
-            halign = Gtk.Align.END;
-        }
-    }
-
-    Gtk.Entry nick;
-    Gtk.Entry realname;
-    Gtk.Button done;
-
-    public class SettingsDialog : Gtk.Dialog {
-
-        public SettingsDialog () {
-            var main = new Gtk.Grid ();
-            main.margin = 12;
-            main.column_spacing = 6;
-            main.row_spacing = 6;
-
-            nick = new Gtk.Entry ();
-            realname = new Gtk.Entry ();
-
-            done = new Gtk.Button.with_label (_("Done"));
-
-            main.attach (new LLabel.right (_("Nick:")), 0, 0, 1, 1);
-            main.attach (nick, 1, 0, 1, 1);
-            main.attach (new LLabel.right (_("Real Name:")), 0, 1, 1, 1);
-            main.attach (realname, 1, 1, 1, 1);
-            main.attach (done, 1, 2, 1, 1);
-
-            modal = true;
-            (get_content_area () as Gtk.Container).add (main);
-            this.title = _("User Settings");
-
-            nick.changed.connect (update_sensivity);
-            realname.changed.connect (update_sensivity);
-
-            done.clicked.connect (() => {
-                var settings = Cable.Settings.get_default ();
-                settings.real_name = realname.text;
-                settings.nick = nick.text;
-
-                destroy ();
-            });
-
-            nick.text = Settings.get_default ().nick;
-            realname.text = Settings.get_default ().real_name;
-
-            update_sensivity ();
-        }
-
-        void update_sensivity () {
-            done.sensitive = nick.text != "" && realname.text != "";
-        }
-    }
-}

=== added file 'src/Widgets/StatusBar.vala'
--- src/Widgets/StatusBar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/StatusBar.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,49 @@
+/***
+    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.Widgets.StatusBar : Granite.Widgets.StatusBar {
+
+    public signal void send_message (string message);
+
+    public StatusBar () {
+        var item = get_nth_item (1);
+        item.remove (item.get_child ());
+        item.set_expand (true);
+        item.halign = Gtk.Align.FILL;
+        
+        var entry = new Gtk.Entry ();
+        entry.halign = Gtk.Align.FILL;
+        
+        item.add (entry);
+        
+        get_nth_item (0).width_request = 156;
+        get_nth_item (2).width_request = 156;
+        
+        insert_widget (main_actions.get_action ("JoinChannel").create_tool_item() as Gtk.ToolButton, true);
+        insert_widget (main_actions.get_action ("LeaveChannel").create_tool_item() as Gtk.ToolButton, true);
+        insert_widget (main_actions.get_action ("EditCurrentId").create_tool_item() as Gtk.ToolButton, true);
+        insert_widget (main_actions.get_action ("Preferences").create_tool_item() as Gtk.ToolButton);
+        insert_widget (main_actions.get_action ("About").create_tool_item() as Gtk.ToolButton);
+
+        entry.activate.connect (() => {
+            send_message (entry.text);
+            entry.text = "";
+        });
+    }
+}

=== added file 'src/Widgets/Welcome.vala'
--- src/Widgets/Welcome.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Welcome.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,112 @@
+/***
+    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.Widgets.Welcome : Granite.Widgets.Welcome {
+
+    public signal void done (Settings.Network network, Settings.Identity identity, string channel);
+
+    Gtk.Entry channel_entry;
+
+    public Welcome () {
+        base (_("Connect to the IRC world."), _("Join a Channel."));
+
+        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;
+
+        // Entries/Comboboxes
+        var server_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Settings.networks.size; i++)
+            server_entry.append (i.to_string (), Settings.networks[i].name);
+        server_entry.active = 0;
+
+        var id_entry = new Gtk.ComboBoxText.with_entry ();
+        for (int i = 0; i < Settings.identities.size; i++)
+            id_entry.append (i.to_string (), Settings.identities[i].nick_name);
+        id_entry.active = 0;
+
+        channel_entry = new Gtk.Entry ();
+        channel_entry.secondary_icon_name = "edit-redo-symbolic";
+        channel_entry.text = "#";
+        
+        // button
+        var join_button = new Gtk.Button.with_label (_("Join Channel"));
+        join_button.halign = Gtk.Align.END;
+        
+        var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        button_box.layout_style = Gtk.ButtonBoxStyle.END;
+        button_box.add (join_button);
+        
+        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 (button_box, 1, 3, 1, 1);
+        grid.margin = 6;
+
+        channel_entry.insert_text.connect ((text) => 
+            Utils.filter (channel_entry, text, {" ", ":"})
+        );
+
+        join_button.clicked.connect (() => channel_entry.activate ());
+        channel_entry.icon_release.connect (() => channel_entry.activate ());
+        channel_entry.activate.connect (() => {
+            Settings.Network network;
+            Settings.Identity identity;
+
+            if (server_entry.active_id == null) {
+                network = new Settings.Network (server_entry.get_active_text ());
+            } else {
+                network = Settings.networks[int.parse (server_entry.active_id)];
+            }
+
+            if (id_entry.active_id == null) {
+                identity = new Settings.Identity (id_entry.get_active_text ());
+            } else {
+                identity = Settings.identities[int.parse (id_entry.active_id)];
+            }
+
+            done (network, identity, 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/Window.vala'
--- src/Window.vala	1970-01-01 00:00:00 +0000
+++ src/Window.vala	2013-06-28 19:09:26 +0000
@@ -0,0 +1,272 @@
+/***
+    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.
+***/
+
+Gtk.ActionGroup main_actions;
+
+public class Cable.Window : Gtk.Window {
+
+    bool welcome_shown;
+
+    Gtk.EventBox display_box;
+    Widgets.ServerList server_list;
+
+    Gtk.Grid layout;
+    Gtk.Toolbar toolbar;
+    Granite.Widgets.ThinPaned paned;
+    Widgets.StatusBar statusbar;
+    Widgets.Welcome welcome;
+
+    Gtk.UIManager ui;
+
+    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>
+
+            <popup name="AppMenu">
+                <menuitem name="Preferences" action="Preferences"/>
+            </popup>
+        </ui>
+    """;
+
+    public Window (Cable.App app) {
+        GLib.Object (application: app);
+        Settings.init ();
+        init_actions ();
+        init_layout ();
+    }
+
+    ~Window () {
+        string [] channels = {};
+
+        foreach (var server in server_list.servers) {
+            foreach (var channel in server.channels) {
+                channels += string.join (":", server.network.address,
+                                         server.identity.nick_name, channel.name);
+                server.leave_channel (channel.name);
+            }
+        }
+
+        Settings.settings.set_strv ("channels", channels);
+    }
+
+   public 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 ();
+    }
+
+    private void init_layout () {
+        layout = new Gtk.Grid ();
+        server_list = new Widgets.ServerList ();
+        display_box = new Gtk.EventBox ();
+        toolbar = new Gtk.Toolbar ();
+        paned = new Granite.Widgets.ThinPaned ();
+        welcome = new Widgets.Welcome ();
+        statusbar = new Widgets.StatusBar ();
+
+        layout.attach (toolbar, 0, 0, 1, 1);
+
+        var join_button = main_actions.get_action ("JoinChannel").create_tool_item() as Gtk.ToolButton;
+        var leave_button = main_actions.get_action ("LeaveChannel").create_tool_item() as Gtk.ToolButton;
+
+        toolbar.vexpand = false;
+        //toolbar.add (join_button);
+        //toolbar.add (leave_button);
+
+        /*var spacer = new Gtk.ToolItem ();
+        spacer.set_expand (true);
+        toolbar.add (spacer);
+
+        var menu = ui.get_widget ("ui/AppMenu") as Gtk.Menu;
+        app_menu = (application as Granite.Application).create_appmenu (menu);
+        toolbar.add (app_menu);
+        */
+
+        welcome.done.connect (join_channel);
+        welcome.hexpand = true;
+        welcome.vexpand = true;
+
+        paned.position = 150;
+        paned.pack1 (server_list, false, false);
+        paned.pack2 (display_box, true, false);
+
+        this.title = "Cable";
+        this.icon_name = "internet-chat";
+        this.set_default_size (740, 480);
+        this.window_position = Gtk.WindowPosition.CENTER;
+        this.show_all ();
+
+        statusbar.send_message.connect ((msg) => {
+            server_list.current_server.send_message (server_list.current_channel, msg);
+        });
+
+        server_list.item_selected.connect ((item) => {
+            if (item != null && item is Widgets.Channel) {
+                var channel = item as Widgets.Channel;
+                var content = display_box.get_children ().nth_data (0);
+
+                if (content != null)
+                    display_box.remove (content);
+
+                display_box.add ((item as Widgets.Channel).room);
+                display_box.show_all ();
+                title = string.join (" — ", channel.name, channel.server.identity.nick_name);
+            }
+        });
+
+        var channels = Settings.settings.get_strv ("channels");
+
+        if (channels.length > 0) {
+            welcome_shown = false;
+            layout.attach (paned, 0, 1, 1, 1);
+            layout.attach (statusbar, 0, 2, 1, 1);
+            this.add (layout);
+            this.show_all ();
+
+            foreach (var channel in channels) {
+                var parts = channel.split (":");
+
+                Settings.Network network = null;
+                Settings.Identity identity = null;
+
+                foreach (var nw in Settings.networks)
+                    if (nw.address == parts[0])
+                        network = nw;
+
+                foreach (var id in Settings.identities)
+                    if (id.nick_name == parts[1])
+                        identity = id;
+
+                if (network == null)
+                    network = new Settings.Network (parts[0]);
+
+                if (identity == null)
+                    identity = new Settings.Identity (parts[1]);
+
+                join_channel (network, identity, parts[2]);
+            }
+
+            server_list.selected = server_list.servers[0].channels[0];
+        } else {
+            welcome_shown = true;
+            layout.attach (welcome, 0, 1, 1, 1);
+            this.add (layout);
+            this.show_all ();
+            welcome.focus_channel_entry ();
+        }
+    }
+
+    void join_channel (Settings.Network network, Settings.Identity identity, string channel_name) {
+        var server = server_list.get_server (network.address, identity.nick_name);
+
+        if (server == null) {
+
+            server = new Widgets.Server (network, identity);
+            server_list.add_server (server);
+
+            server.joined_channel.connect ((channel) => {
+                if (welcome_shown) {
+                    welcome_shown = false;
+                    layout.remove (welcome);
+                    layout.attach (paned, 0, 1, 1, 1);
+                    layout.attach (statusbar, 0, 2, 1, 1);
+                    this.show_all ();
+                    welcome.focus_channel_entry ();
+                    server_list.selected = channel;
+                }
+            });
+
+            server.left_channel.connect ((channel) => {
+                if (server_list.get_n_servers () == 0) {
+                    welcome_shown = true;
+                    layout.remove (paned);
+                    layout.remove (statusbar);
+                    layout.attach (welcome, 0, 1, 1, 1);
+                    this.show_all ();
+                }
+            });
+        }
+
+        server.join_channel (channel_name);
+    }
+
+    void action_join_channel () {
+        var dialog = new Dialogs.JoinChannel ();
+        dialog.done.connect (join_channel);
+        dialog.show_all ();
+    }
+
+    void action_leave_channel () {
+        var channel = server_list.current_channel;
+
+        if (channel != null)
+            server_list.current_server.leave_channel (channel.name);
+        else
+            warning ("No channel selected, cannot leave.");
+    }
+    
+    void action_edit_identity () {
+        var dialog = new Dialogs.ManageIdentity (server_list.current_server.identity);
+        dialog.show_all ();
+    }
+
+    void action_about () {
+        (application as Cable.App).show_about (this);
+    }
+
+    void action_preferences () {
+        var dialog = new Dialogs.Preferences ();
+        dialog.show_all ();
+    }
+
+    private 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 },
+
+        { "About", "help-info-symbolic", N_("About"), null,
+          N_("About"), action_about }
+    };
+}

=== removed file 'src/doodleIRC.vala'
--- src/doodleIRC.vala	2013-05-29 18:15:05 +0000
+++ src/doodleIRC.vala	1970-01-01 00:00:00 +0000
@@ -1,385 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-    BEGIN LICENSE
-
-    Copyright (C) 2013 Akshay Shekher <[e-mail]>
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
-***/
-
-namespace doodleIRC {
-
-    public errordomain IRCError {
-        COULD_NOT_CONNECT,
-        COULD_NOT_JOIN
-        // ...
-    }
-
-    public class Channel {
-
-        public string nick;
-        public string topic;
-        public List<string> users;
-        public string name;
-
-        public Channel (string name) {
-            this.name = name;
-        }
-    }
-
-    public class DoodleIRCServer {
-
-        // Signals
-        public signal void on_connect_complete ();
-        public signal void on_message (string sender, string chan, string msg);
-        public signal void on_action (string sender, string chan, string msg);
-        public signal void on_notice (string notice);
-        public signal void on_error (string error_msg);
-        public signal void on_user_join (string chan, string nick);
-        public signal void on_join_complete (string chan, string nick);
-        public signal void on_user_quit (string chan, string nick, string msg);
-        public signal void on_names_listed (string chan, string[] names);
-
-        public delegate void GetTopicFunc (string chan, string topic);
-        public List<Channel> chans;
-
-        GetTopicFunc topic_received;
-        string nick;
-        bool away;
-        string server_url;
-        User user;
-        SocketConnection connection;
-        DataInputStream response;
-        bool connected;
-        List<string> to_send;
-        Gee.HashMap<string, string> list_of_names;
-
-        public DoodleIRCServer (string url, User user,string nick) {
-            this.server_url = url;
-            this.user = user;
-            this.nick = nick;
-            away = false;
-
-            topic_received = (chan, topic) => {
-                debug (chan + "=>" + topic);
-            };
-            this.chans = new List<Channel> ();
-            connected = false;
-            to_send = new List<string> ();
-
-            list_of_names = new Gee.HashMap<string,string> ();
-
-            on_connect_complete.connect (() => {
-                to_send.foreach ((cmd) => {
-                    debug ("Sending "+cmd);
-                    raw_send (cmd);
-                    to_send.remove (cmd);
-                });
-            });
-        }
-
-        ~DoodleIRCServer () {
-            print ("Exiting");
-            quit_server ("Client Quit");
-        }
-
-        public async void connect (string server = "") {
-            try {
-                // Resolve hostname to IP address
-                var resolver = Resolver.get_default ();
-                var addresses = yield resolver.lookup_by_name_async (this.server_url, null);
-                var address = addresses.nth_data (0);
-                debug ("Resolved %s to %s\n".printf (this.server_url, address.to_string ()));
-
-                // Connect
-                var client = new SocketClient ();
-                connection = yield client.connect_async (new InetSocketAddress (address, 6667));
-                debug ("Connected to %s\n".printf (this.server_url));
-                this.connected = true;
-                //response stream
-                response = new DataInputStream (connection.input_stream);
-
-                // Send USER request
-                var message = "USER %s %s %s :%s\r\n".printf (user.username, user.hostname,
-                                                              user.servername, user.realname);
-                raw_send (message);
-                debug ("Wrote request USER\n");
-
-                // Send NICK request
-                message = "NICK %s\r\n".printf (nick);
-                raw_send (message);
-                debug ("Wrote nick request\n");
-
-                wait.begin ();
-            } catch (Error e) {
-                error ("Could not connect: %s".printf (e.message));
-            }
-
-        }
-
-        public async void wait () {
-            try {
-                var line =  yield response.read_line_async ();
-                parse_line (line);
-            } catch (Error e) {
-                print ("Error: %s\n".printf (e.message));
-            }
-
-            if (connected)
-                wait.begin ();
-        }
-
-        private void parse_line (string line) {
-            print (line + "\n");
-
-            if (line[0] != ':') {
-                process_named_server_message (line);
-                return;
-            }
-
-            if (line[0] == ':') {
-                if ((line.split (" ")[1][0]).isdigit ()) {
-                    process_numeric_cmd (line);
-                } else {
-                    process_named_message (line);
-                }
-            }
-        }
-
-        private void process_named_message (string line) {
-            string sender="", cmd="", chan="", msg="";
-            parse_named_msg (line, out sender,out cmd, out  chan, out msg);
-
-            switch (cmd.up ()) {
-                case "PRIVMSG":
-                    if (msg.split (" ")[0] == "\001ACTION") {
-                        msg = msg.replace ("ACTION ", "");
-                        msg = msg.replace ("\001", "");
-                        on_action (sender, chan, msg);
-                        break;
-                    }
-
-                    print ("Chan-> "+chan+"\nMSG-> "+msg+"\n");
-                    on_message (sender, chan, msg);
-                    break;
-
-                case "QUIT":
-                    print (" %s has quit\n".printf (sender));
-                    on_user_quit (chan, sender, msg);
-                    break;
-
-                case "JOIN":
-                    if (sender == nick) {
-                        on_join_complete (chan, sender);
-                        break;
-                    }
-                    print ("User has Joined");
-                    on_user_join (chan, sender);
-                    break;
-            }
-        }
-
-        private void process_named_server_message (string line) {
-            var cmd = line.split (" ")[0].strip ();
-            var msg = line.split (" :")[1].strip ();
-
-            switch (cmd.up ()) {
-                case "PING":
-                    print ("pinged\n");
-                    raw_send (line.replace ("PING","PONG"));
-                    break;
-
-                case "NOTICE":
-                    print ("Noice: "+msg+"\n");
-                    on_notice (msg);
-                    break;
-
-                case "ERROR":
-                    print ("An Error Occured: %s\n".printf (msg));
-                    on_error (msg);
-                    break;
-            }
-        }
-
-        private void process_numeric_cmd (string line) {
-            var first_split = line.split (" ");
-            /* this might come handy in the future :) */
-            //var sender = first_split[0].strip ();
-            var cmd = first_split[1].strip ();
-            var msg = line.split (" :")[1].strip ();
-
-            /* more info about these commands can be found at the IRC RFC page */
-            switch (cmd) {
-                case "001":
-                    on_connect_complete ();
-                    break;
-
-                case "005":
-                    // this.connect (msg);
-                    break;
-
-                case "301":
-                    print ("Away: "+msg);
-                    break;
-
-                case "433": // nick name is use
-                    change_nick (this.nick + "_");
-                    rejoin_channels ();
-                    break;
-
-                case "353": //RPL_NAMESLISTED
-                    var chan = first_split[4];
-                    if (list_of_names.has_key (chan)) {
-                        var names = list_of_names.get (chan);
-                        names = " " + msg;
-                        list_of_names.set (chan, names);
-                    } else {
-                        list_of_names.set (chan, msg);
-                    }
-
-                    break;
-
-                case "366": //RPL_ENDOFNAMES
-                    foreach (var channel in list_of_names.keys.to_array ()) {
-                        on_names_listed (channel, list_of_names.get (channel).split (" "));
-                    }
-
-                    list_of_names.clear ();
-                    break;
-                case "332":
-                    var chan = first_split[3].strip ();
-                    chans.foreach((channel) => {
-                        if (channel.name == chan) {
-                            channel.topic = msg;
-                            topic_received (channel.name, msg);
-                        }
-                    });
-                    break;
-            }
-        }
-
-        private void parse_named_msg (string line, out string sender,out string cmd,
-                                      out string chan, out string msg) {
-            // split the message from the info
-            var first_split = line.split (":");
-            var info = first_split[1];
-            // msg = join_str_ar (2, first_split.length, first_split);
-            msg = line.split (" :")[1];
-
-            // split the info to extract sender and chan
-            var second_split = info.split (" ");
-            cmd = second_split[1].strip ();
-            chan = second_split[2].strip ();
-            sender = second_split[0].strip ().split ("!")[0];
-        }
-
-        private void raw_send (string line) {
-            try {
-                connection.output_stream.write (line.data);
-                connection.output_stream.flush ();
-            } catch (Error e) {
-                error ("raw_send: %s".printf (e.message));
-            }
-        }
-
-        public void send (string cmd) {
-            if (connected)
-                raw_send (cmd);
-            else
-                to_send.append (cmd);
-        }
-
-        private void rejoin_channels () {
-            // Send JOIN request
-            foreach (var chan in chans) {
-                string chan_name = chan.name;
-                raw_send ("JOIN %s\r\n".printf (chan_name));
-                print ("Wrote request to join %s\n".printf (chan_name));
-            }
-        }
-
-        public void kick_user (string chan, string user, string reason) {
-            send ("KICK %s %s :%s\r\n".printf (chan, user, reason));
-        }
-
-        public void join_chan (string chan, string key="") /*throws IRCError*/ {
-            send ("JOIN %s :%s\r\n".printf (chan, key));
-            var channel = new Channel (chan);
-            chans.append (channel);
-        }
-
-        public void quit_server (string message) {
-            send ("QUIT :%s\r\n".printf (message));
-        }
-
-        public void leave_chan (string chan) {
-            send ("PART %s\r\n".printf (chan));
-        }
-
-        public void write (string chan, string msg) {
-            send ("PRIVMSG %s :%s\r\n".printf (chan, msg));
-        }
-
-        public void notice (string to, string text) {
-            send ("NOTICE %s :%s\r\n".printf (to, text));
-        }
-
-        public void get_names (string chan) {
-            send ("NAMES %s\r\n".printf (chan));
-        }
-
-        public void set_away (string reason) {
-            away = true;
-            send ("AWAY :%s\r\n".printf (reason));
-        }
-
-        public void set_back () {
-            away = false;
-            send ("AWAY \r\n");
-        }
-
-        public void toggle_away (string reason = "") {
-            if (this.away)
-                set_back ();
-            else
-                set_away (reason);
-        }
-
-        public void change_nick (string nick) {
-            this.nick = nick;
-            raw_send ("NICK %s\r\n".printf (this.nick));
-        }
-
-        public void write_action (string chan, string msg) {
-            write (chan, "\001ACTION %s\001\r\n".printf (msg));
-        }
-
-        public void disconnect () {
-            raw_send ("QUIT :bye");
-            connected = false;
-        }
-
-        public void get_topic (string chan, GetTopicFunc func) {
-            topic_received = func;
-            send ("TOPIC %s\r\n".printf (chan));
-        }
-    }
-
-    public struct User {
-        public string username;
-        public string hostname;
-        public string servername;
-        public string realname;
-    }
-}