Merge lp:~julien-spautz/cable/model-view into lp:cable

[Julien Spautz]

Bunch of small fixes, improves on that "internal-stuff" branch. Most importantly there is now an actual separation between frontent (widgets) and backend (maki, settings, unity, notify) so we can make UI changes without having to worry about backend stuff.

[Julien Spautz (julien-spautz)]

4687 lines (+2199/-1537) 31 files modified (has conflicts)

Because gotwig loves unnessecarily large diffs :P

I moved some files, and the model/view separation in mainly moving a lot of code from one file to another, so that explains the diff size.

[Julien Spautz (julien-spautz)]

Also, when committing a merged branch, use the --author option. It seems to be missing in quite a lot of commits.

[Julien Spautz (julien-spautz)]

Conflicts are resolved, the branch is now ready for review.

[lp:~julien-spautz/cable/model-view]

100. By Julien Spautz on 2013-07-25

some changes to backend interface, partial cleanup of room class, fixed regressions

101. By Julien Spautz on 2013-07-25

simplified name completion function

102. By Julien Spautz on 2013-07-25

implemented automatic user colors, removed legacy code for manual user colors

[Eduard Gotwig (gotwig)]

A long channel topic makes the window grow very much in the X-Axis.

I would like to see a similar approach like in empathy to fix this, where you have a seperate expander button.

review: Needs Fixing

[Julien Spautz (julien-spautz)]

> A long channel topic makes the window grow very much in the X-Axis.
>
> I would like to see a similar approach like in empathy to fix this, where you
> have a seperate expander button.

I think you mean Y-axis (height), but yes I agree. I tried putting everything into a Gtk.Expander, but it looks weird. We'll probably need some custom widget.

[lp:~julien-spautz/cable/model-view]

103. By Julien Spautz on 2013-07-26

add topic expander

104. By Julien Spautz on 2013-07-26

only color user names, and not their messages, add some vertical padding between messaes in chat display

[Julien Spautz (julien-spautz)]

The topic is now collapseable/expandable. Also only user names are colored, to avoid everything being too colorful.

[982c80311320c1b (alexander-wilms)]

When I join channels with many users like #ubuntu the UI freezes fir me. Also, the "Join Channel" window is opened behind the main Window. Otherwise looking great

[Julien Spautz (julien-spautz)]

The freeze is a known bug, see bug #1201235

[982c80311320c1b (alexander-wilms)]

I noticed that user names in front of messages containing my name are black, not colored

[982c80311320c1b (alexander-wilms)]

One user, who was only online in #elementary-dev showed up in the other channels I had open, #libreoffice-design and #elementary-apps without having joined it

[982c80311320c1b (alexander-wilms)]

URL parsing doesn't work reliably. Valadoc urls are not completely highlighted

[lp:~julien-spautz/cable/model-view]

105. By Julien Spautz on 2013-07-26

color nick also for ping messages + add badge for unread messages

[Julien Spautz (julien-spautz)]

I think the valadoc URLs make problems because they contain exclamation points. There's already a bug report out there.
I fixed the color thing and added badges to the channel items displaying the amount of unread messages. The badge should also turn red if there is a ping message in the channel, but I think that's currently not possible. I might report a bug in granite for this.

[lp:~julien-spautz/cable/model-view]

106. By Julien Spautz on 2013-07-26

modified regex for URL matching

[Julien Spautz (julien-spautz)]

Valadoc URLs are now matched correctly.

[lp:~julien-spautz/cable/model-view]

107. By Julien Spautz on 2013-07-26

another slight regex modification

[Julien Spautz (julien-spautz)]

Improved regex to match https://maps.google.com/maps/ms?msid=213619938004449447454.0004cb13c294e22189aa2&msa=0&ll=25.799891,-19.335937&spn=115.89126,228.339844&source=gplus-ogsb&dg=feature

[Eduard Gotwig (gotwig)]

expander has no effect. (Ubuntu 13.10)

Where is the button to open Cable settings window?

Why do you use a fixed width for sidepanes?

review: Needs Fixing

[Julien Spautz (julien-spautz)]

The expander is a button with a gtk.arrow, don't know what went wrong but for me it works.

Prefs are currently unaccessible, not sure where to put them. The toolbar at the bottom left doesn't make sense, and an entry in the launcher quicklist is too far away... Any suggestions?

Sidepanes have a minimum size, but they are expandable. There might be some problems with the topic bar or the chat display that cause them to be fixed. I'll look into that later.

[Eduard Gotwig (gotwig)]

probably it would be good to link for now this settings window onto the username of the user nickname itself.

on hover, this should be a button, if the user clicks on it, open Cable preferences =)

[Julien Spautz (julien-spautz)]

I guess it would make more sense to open the "edit current identity" dialog when clicking the nick name.

[Eduard Gotwig (gotwig)]

we have such a dialog :D screenshot please...

[Julien Spautz (julien-spautz)]

You can open it using Ctrl+I but you currently cant change your nick name.

[Julien Spautz (julien-spautz)]

The bug where people appear in channels they haven't joined happens when they change their nick. The new nick is then added to all channels.

[982c80311320c1b (alexander-wilms)]

When I restart, Cable also often fails to re-join the channels

[Julien Spautz (julien-spautz)]

Yay implemented autoscrolling! (Will push soon)

[lp:~julien-spautz/cable/model-view]

108. By Julien Spautz on 2013-07-27

auto scrolling, not joined embedded alert

[Julien Spautz (julien-spautz)]

Pushed.

[Eduard Gotwig (gotwig)]

whats up with the sidebars :X sometimes they are fixed, and cant be moved.

review: Needs Information

[Julien Spautz (julien-spautz)]

> whats up with the sidebars :X sometimes they are fixed, and cant be moved.

It seems that this is caused by the topic, event though I don't know why. When collapsed it is ellipsized and when expanded it is wrapped so it should resize fine, but it doesn't.

[lp:~julien-spautz/cable/model-view]

109. By Julien Spautz on 2013-07-28

fixed most compilation warnings, cleaned up some code, readded preferences, made text selectable

110. By Julien Spautz on 2013-07-30

fixed issued with renaming, some internal changes, created autoscrolled class, stub controller class

111. By Julien Spautz on 2013-08-06

passive view, time stamps, unit testing, added README, fixed all warnings, activated experimental vala features (chained relational expressions and regex), use fatal warnings

[Julien Spautz (julien-spautz)]

Sorry guys this is taking so long, but I figured if I'm refactoring so much code, I might as well do it right.

Anyway, I implemented a new design pattern called passive view (it's a Model/View/Controller pattern) that makes the code significantly more readable and maintainable, even if the code now seems more complex. I also wrote a README file which is now included in the branch where I describe cable's new structure and how it works. If anything is unclear please tell me and I'll try to clearify it.

I also added proof of concept unit testing support which might prove to be very helpful in the future. There is currently only one test, which can be run using the --unit-test CLI switch.

Btw, the resize bug is still not fixed, it is most likely because of the topic or chat widget, but I haven't yet figured out how to fix it.

[lp:~julien-spautz/cable/model-view]

112. By Julien Spautz on 2013-08-06

added some more unit tests

113. By Julien Spautz on 2013-08-07

some more unit tests

114. By Julien Spautz on 2013-08-08

fixed runtime warnings, forgot to setup signals in Irc.Server.from_name constructor...

[Eduard Gotwig (gotwig)]

Ok there are two things which still bug me:

1. I can't remove my user identity

2. If the user gets forwarded to the channel ##javascript when he entered #javascript, on the next restart of Cable, it tries to connect to both ##javascript and #javascript.
Instead #javascript, the original entered channel, should no longer be an entry in the list.

review: Needs Fixing

[Eduard Gotwig (gotwig)]

Oh, and please show the corresponding identity name after each servername, example:

Freenode (gotwig)

Freenode (kate)

review: Needs Fixing

[lp:~julien-spautz/cable/model-view]

115. By Julien Spautz on 2013-08-11

fixing some problems concerning networks and identities

[Julien Spautz (julien-spautz)]

Removing identities should now work as expected, and I added the nick name after the server name, though it doesn't look nice as the nick is truncated most of the time.

[lp:~julien-spautz/cable/model-view]

116. By Julien Spautz on 2013-08-11

fix compilation errors

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-14 15:58:58 +0000
+++ CMakeLists.txt	2013-08-11 12:01:40 +0000
@@ -47,29 +47,53 @@
 
 include(ValaPrecompile)
 vala_precompile(VALA_C
+
     src/Cable.vala
-    src/Window.vala
-    src/Utils.vala
-    
-    src/Services/Client.vala
-    src/Services/Settings.vala
-    src/Services/Identity.vala
-    src/Services/Network.vala
-    src/Services/Unity.vala    
-
-    src/Widgets/Room.vala
+
+    src/Utils/Utils.vala
+    src/Utils/AutoScrolled.vala
+    src/Utils/EmbeddedAlert.vala
+    src/Utils/Identity.vala
+    src/Utils/Network.vala
+
+    src/Irc/Maki.vala
+    src/Irc/Irc.vala
+    src/Irc/Client.vala
+    src/Irc/Server.vala
+    src/Irc/Channel.vala
+
+    src/Controller/Window.vala
+    src/Controller/Server.vala
+    src/Controller/Channel.vala
+
+    src/View/Server.vala
+    src/View/Channel.vala
+    src/View/Window.vala
+
+    src/Settings/Settings.vala
+    src/Settings/Preferences.vala
+    src/Settings/SavedState.vala
+
+    src/Services/Launcher.vala
+    src/Services/Notification.vala
+
+    src/Widgets/Window.vala
+    src/Widgets/Welcome.vala
     src/Widgets/Server.vala
     src/Widgets/Channel.vala
+    src/Widgets/Room.vala
     src/Widgets/ChatDisplay.vala
-    src/Widgets/ServerList.vala
     src/Widgets/User.vala
-    src/Widgets/Welcome.vala
-    
+    src/Widgets/TopicBar.vala
+
     src/Dialogs/JoinChannel.vala
     src/Dialogs/Preferences.vala
     src/Dialogs/ManageIdentity.vala
     src/Dialogs/ManageNetwork.vala
     
+    src/Tests/Tests.vala
+    src/Tests/Utils.vala
+
     ${CMAKE_BINARY_DIR}/src/Config.vala
 PACKAGES
     gtk+-3.0
@@ -80,6 +104,9 @@
 OPTIONS
     --target-glib=2.32
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
+    --enable-experimental
+    --fatal-warnings
+    --verbose
     )
 
 add_subdirectory (po)

=== added file 'README.rst'
--- README.rst	1970-01-01 00:00:00 +0000
+++ README.rst	2013-08-11 12:01:40 +0000
@@ -0,0 +1,121 @@
+Developer Documentation
+=======================
+
+This document explains how cable works internally and what guidelines you should follow when developing for it.
+
+Design Pattern
+==============
+
+The current design pattern could be called "Passive View", see http://martinfowler.com/eaaDev/PassiveScreen.html.
+
+The View
+--------
+
+The View is a software layer that acts as an interface between the program and the user. The View can be acted upon by the user and notify the application of these events (using signals). But its state can also be changed by the application to present some content to the user or request input from the user.
+
+In the ``src/View`` folder you will find interfaces that the Controller uses to communicate with the View. The actual implementation can be found in the ``src/Widgets`` folder. This separation bears the advantage that we can change the implementation of the View completely as long as we implement the interfaces. This makes the application independant of the GUI, and we could replace it by a text-based UI or even by a computer simulated UI to run unit tests.
+
+Nota bene: The View does not know about any other module (except possibly ``src/Utils`` which contains functions accessible to everyone) 
+
+The Model/Backend
+-----------------
+
+The traditional name 'Model' doesn't really fit Cable's architecture, as it is based on an interactive networking protocol (namely the IRC protocol) and not on a set of data or even a database. The following modules form the backend of the app and are more or less independant of each other.
+
+**Irc**
+
+The Irc namespace contains wrapper classes that provide convenient methods, properties and signals that map to dbus calls to the maki IRC daemon. Following naming conventions have been used:
+
+    - All signals are prefixed with ``event_``
+    - All methods that send commands to the server are prefixed with ``send_``
+    - Most methods that yield an immediate return value are properties, if it makes sense
+
+Examples:
+
+    ``public void send_join (string key = "");``
+
+    ``public void event_join (string from);``
+
+    ``public bool joined { get; }``
+
+**Settings**
+
+The Settings namespace contains convenient interfaces to the dconf/gsettings using Granite.Services.Settings.
+
+**Services**
+
+The Services should (whenever possible) be static classes. Currently there is a ``Launcher`` class as interface to libunity and a ``Notification`` class as interface to libnotify. They should have an extremely simple API and contain only functions that are actually used in the app. For example, here you see the ``Cable.Services.Launcher`` API:
+
+    ``public static int64 jobs { get; set }``
+
+    ``public static double progress { get; set }``
+
+    ``public static bool urgent { get; set }``
+
+    ``public static void init ();``
+
+**Utils**
+
+This namespace contains some useful functions and classes that are used in multiple places in the app. The Network and Identity classes, for example, store all networks and identities in a convenient way and make sure no duplicates will be created.
+
+The Controller
+--------------
+
+The controller is the brain of the app in the sense that it connects different classes that don't know about each other and contains most of the program logic. Conversely, no one knows about the Controller, which means no one can actively act upon the Controller. To communicate with other parts of the application, the Controller connects to their public signals, or uses their public methods and properties.
+
+********************************************************************************
+
+Tiers
+=====
+
+Now that you know about the separation of concerns implemented by the Passive View pattern, I want to explain a recurring pattern in the app which can be broken up into 3 (or 4) tiers, a tree-like hierarchial structure. It looks like this:
+
+	Application Tier (one instance)
+
+		↓ (n)
+
+	Window Tier (n windows per application, unless artificially restricted)
+
+		↓ (n)
+
+	Server Tier (n server connections can be established per window)
+
+		↓ (n)
+
+	Channel Tier (n channels per server)
+
+This means that the app owns multiple windows, each window has a list of servers, which in turn own any number of channels. This structure exists in many places in the program, which is why it is worth noticing. Obviously it exists in the View/Widgets layer, but also the controller is split into multiple classes, to get cleaner code.
+
+In order to make communication between different parts of the application as clean and abstract as possible, it shall *only* occur via these tiers. That is you should not (and cannot) access, any widgets from the Controller, as all communication has to happen via ``View.Window``, ``View.Server`` or ``View.Channel``.
+
+So instead of calling something like this from the controller:
+
+	``channel_view.room.topic.text = new_topic;``
+
+you would use:
+
+	``channel_view.topic = new_topic;``
+
+and the channel widget will take care of the forwarding.
+
+********************************************************************************
+
+Unit Testing
+============
+
+Unit Testing, Test Driven Development, Extreme Programming… What can we learn from these techniques?
+
+GLib provides a very basic way to implement unit tests, and libgee built their TestCase class on it. It allows for simple unit tests, nothing fancy but really straight forward. The main question is where does it make sense to apply unit tests and how do we implement them in a sensible way.
+
+Most (virtually all) of the logic lies in the Controller module, as intended. This allows us to bypass the View and replace it by a fake View that implements the same interface but is controlled by the programm. In the same way, we can replace the backend and imitate it's interface to provide a fake backend and simulate really weird server bugs that only happen very rarely and can therefore not be reproduced reliably in a real world environement.
+
+Functions and classes in the Utils namespace can also easily be unit tested as they are not connected with the rest of the program. An example would be the URL parsing function.
+
+Note that none of this has been implemented (except to a very simple test which can be run using the ``--unit-test`` CLI switch, just as a proof of concept).
+
+********************************************************************************
+
+Questions?
+==========
+
+If you have any questions relating to the architecture of the app, shoot me an email at <[e-mail]> or ask me on IRC (#elementary-dev or #elementary-apps on irc.freenode.net). My nick is julienspautz.
\ No newline at end of file

=== modified file 'data/org.pantheon.cable.gschema.xml'
--- data/org.pantheon.cable.gschema.xml	2013-07-07 17:40:59 +0000
+++ data/org.pantheon.cable.gschema.xml	2013-08-11 12:01:40 +0000
@@ -23,10 +23,5 @@
             <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>
-        <key name="colors" type="as">
-            <default>[]</default>
-            <summary>Colors saved, by channel</summary>
-            <description>The format is ["network address:#channel:nickname:color", "..."]</description>
-        </key>
     </schema>
 </schemalist>

=== modified file 'po/cable.pot'
--- po/cable.pot	2013-07-04 14:08:00 +0000
+++ po/cable.pot	2013-08-11 12:01:40 +0000
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:145
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-04 16:07+0200\n"
+"POT-Creation-Date: 2013-07-18 00:31+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"
@@ -18,247 +17,243 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/gotwig/cable/po/../src/Window.vala:302
-#: /home/gotwig/cable/po/../src/Window.vala:303
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:48
+msgid "Development release, not all features implemented"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:91
+msgid "Stylish IRC Client"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:92
+msgid "IRC Client"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:251
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:252
 msgid "Join Channel…"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Window.vala:305
-#: /home/gotwig/cable/po/../src/Window.vala:306
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:254
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:255
 msgid "Leave current Channel"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Window.vala:308
-#: /home/gotwig/cable/po/../src/Window.vala:309
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:257
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:258
 msgid "Edit current Identity…"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Window.vala:311
-#: /home/gotwig/cable/po/../src/Window.vala:312
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:23
-msgid "Preferences"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Window.vala:314
-#: /home/gotwig/cable/po/../src/Window.vala:315
-msgid "About"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:48
-msgid "Development release, not all features implemented"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:86
-msgid "Stylish IRC Client"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Cable.vala:87
-msgid "IRC Client"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:30
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:30
 msgid "Connect to IRC"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:30
-msgid "Select a Channel to join and begin to talk."
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:30
+msgid "Select a channel to join and begin to talk."
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:38
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:36
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:38
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:36
 msgid "Network:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:42
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:40
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:42
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:40
 msgid "Identity:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:46
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:44
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:46
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:44
 msgid "Channel:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/User.vala:35
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:50
+msgid "Connect"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/User.vala:35
 msgid "Change color…"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/User.vala:41
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/User.vala:41
 #, c-format
 msgid "Select the new color for %s"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:134
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:146
-msgid "Mark Away"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:135
-msgid "Leave all channels"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:142
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:77
-#, c-format
-msgid "%s is away."
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:143
-msgid "Mark Present"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Channel.vala:44
-msgid "Leave Channel"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:80
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:217
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:232
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:81
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:328
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:343
 msgid "Operators"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:133
-msgid "Loading Topic…"
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:242
+msgid "Joining $(channel.name)"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:216
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:231
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:327
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:342
 msgid "Regular"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:218
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:233
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:329
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:344
 msgid "Voiced"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:289
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:411
 #, c-format
 msgid "%s joined"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:292
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:414
 #, c-format
 msgid "%s left"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:295
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:417
 #, c-format
 msgid "%s is away"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:26
-msgid "Join Channel"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:44
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Channel.vala:49
+msgid "Leave Channel"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:109
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:121
+msgid "Mark Away"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:110
+msgid "Leave All Channels"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:118
+msgid "Mark Present"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:48
+msgid "johndoe (Without spaces/special characters)"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:53
+msgid "John Doe"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:57
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:63
+msgid "Good night everyone!"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:60
+msgid "Try again later!"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:65
+msgid "Nick Name:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:67
+msgid "Real Name:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:69
+msgid "Part Message:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:71
+msgid "Away Message:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:73
+msgid "Quit Message:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:96
+msgid "Add Identity"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:96
+msgid "Edit Identity"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:44
 msgid "irc.network.net"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:47
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:47
 msgid "Network IRC"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:49
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:49
 msgid "Optional"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:53
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:53
 msgid "Address:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:55
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:55
 msgid "Name:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:57
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:57
 msgid "Password:"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:77
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:77
 msgid "Add Network"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:78
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:78
 msgid "Change Network"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:30
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:26
+msgid "Join Channel"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:23
+msgid "Preferences"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:30
 msgid "Networks"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:31
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:31
 msgid "Identities"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:46
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:46
 msgid "Name"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:47
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:47
 msgid "Address"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:66
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:69
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:66
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:69
 msgid "Add…"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:67
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:70
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:158
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:161
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:67
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:70
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:152
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:155
 msgid "Remove"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:137
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:131
 msgid "Nick"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:138
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:132
 msgid "Real Name"
 msgstr ""
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:157
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:160
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:151
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:154
 msgid "Add"
 msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:44
-msgid "johndoe (Without spaces/special characters)"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:47
-msgid "John Doe"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:49
-msgid "Good night everyone !"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:51
-msgid "Nick Name:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:53
-msgid "Real Name:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:55
-msgid "Part Message:"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:75
-msgid "Add Identity"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:76
-msgid "Edit Identity"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:75
-msgid "Bye."
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:76
-msgid "Quit server."
-msgstr ""

=== modified file 'po/fr.po'
--- po/fr.po	2013-07-05 06:01:24 +0000
+++ po/fr.po	2013-08-11 12:01:40 +0000
@@ -3,262 +3,293 @@
 # This file is distributed under the same license as the cable package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:406
 msgid ""
 msgstr ""
 "Project-Id-Version: cable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-04 16:07+0200\n"
+"POT-Creation-Date: 2013-07-14 18:31+0200\n"
 "PO-Revision-Date: 2013-07-04 17:57+0000\n"
 "Last-Translator: Corentin Noël <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2013-07-05 06:00+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
-"Language: es\n"
-
-#: /home/gotwig/cable/po/../src/Window.vala:302
-#: /home/gotwig/cable/po/../src/Window.vala:303
+
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:48
+msgid "Development release, not all features implemented"
+msgstr "Version en développement, fonctions manquantes"
+
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:86
+msgid "Stylish IRC Client"
+msgstr "Un client IRC élégant"
+
+#: /home/tutebatti/internal-stuff/po/../src/Cable.vala:87
+msgid "IRC Client"
+msgstr "Client IRC"
+
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:252
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:253
 msgid "Join Channel…"
 msgstr "Rejoindre le canal…"
 
-#: /home/gotwig/cable/po/../src/Window.vala:305
-#: /home/gotwig/cable/po/../src/Window.vala:306
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:255
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:256
 msgid "Leave current Channel"
 msgstr "Quitter le canal actuel"
 
-#: /home/gotwig/cable/po/../src/Window.vala:308
-#: /home/gotwig/cable/po/../src/Window.vala:309
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:258
+#: /home/tutebatti/internal-stuff/po/../src/Window.vala:259
 msgid "Edit current Identity…"
 msgstr "Modifier l'identité actuelle"
 
-#: /home/gotwig/cable/po/../src/Window.vala:311
-#: /home/gotwig/cable/po/../src/Window.vala:312
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:23
-msgid "Preferences"
-msgstr "Préférences"
-
-#: /home/gotwig/cable/po/../src/Window.vala:314
-#: /home/gotwig/cable/po/../src/Window.vala:315
-msgid "About"
-msgstr "À propos"
-
-#: /home/gotwig/cable/po/../src/Cable.vala:48
-msgid "Development release, not all features implemented"
-msgstr "Version en développement, fonctions manquantes"
-
-#: /home/gotwig/cable/po/../src/Cable.vala:86
-msgid "Stylish IRC Client"
-msgstr "Un client IRC élégant"
-
-#: /home/gotwig/cable/po/../src/Cable.vala:87
-msgid "IRC Client"
-msgstr "Client IRC"
-
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:30
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:30
 msgid "Connect to IRC"
 msgstr "Se connecter à IRC"
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:30
-msgid "Select a Channel to join and begin to talk."
-msgstr "Sélectionner un salon pour commencer à discuter"
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:30
+msgid "Select a channel to join and begin to talk."
+msgstr ""
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:38
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:36
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:38
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:36
 msgid "Network:"
 msgstr "Réseau :"
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:42
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:40
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:42
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:40
 msgid "Identity:"
 msgstr "Identité :"
 
-#: /home/gotwig/cable/po/../src/Widgets/Welcome.vala:46
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:44
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Welcome.vala:46
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:44
 msgid "Channel:"
 msgstr "Canal :"
 
-#: /home/gotwig/cable/po/../src/Widgets/User.vala:35
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/User.vala:35
 msgid "Change color…"
 msgstr "Changer la couleur…"
 
-#: /home/gotwig/cable/po/../src/Widgets/User.vala:41
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/User.vala:41
 #, c-format
 msgid "Select the new color for %s"
 msgstr "Sélectionner une nouvelle couleur pour %s"
 
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:134
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:146
-msgid "Mark Away"
-msgstr "Signaler comme absent"
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:135
-msgid "Leave all channels"
-msgstr "Quitter tout les canaux"
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:142
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:77
-#, c-format
-msgid "%s is away."
-msgstr "%s est absent."
-
-#: /home/gotwig/cable/po/../src/Widgets/Server.vala:143
-msgid "Mark Present"
-msgstr "Signaler comme présent"
-
-#: /home/gotwig/cable/po/../src/Widgets/Channel.vala:44
-msgid "Leave Channel"
-msgstr "Quitter le canal"
-
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:80
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:217
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:232
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:77
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:245
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:260
 msgid "Operators"
 msgstr "Modérateurs"
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:133
-msgid "Loading Topic…"
-msgstr "Chargement du sujet…"
-
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:216
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:231
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:244
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:259
 msgid "Regular"
 msgstr "Visiteurs"
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:218
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:233
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:246
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:261
 msgid "Voiced"
-msgstr ""
+msgstr "Participants"
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:289
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:317
 #, c-format
 msgid "%s joined"
 msgstr "%s a rejoint le salon"
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:292
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:320
 #, c-format
 msgid "%s left"
 msgstr "%s a quitté le salon"
 
-#: /home/gotwig/cable/po/../src/Widgets/Room.vala:295
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Room.vala:323
 #, c-format
 msgid "%s is away"
 msgstr "%s est absent"
 
-#: /home/gotwig/cable/po/../src/Dialogs/JoinChannel.vala:26
-msgid "Join Channel"
-msgstr "Rejoindre le canal"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:44
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Toolbar.vala:31
+msgid "Search…"
+msgstr "Recherche…"
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Toolbar.vala:46
+msgid "Preferences…"
+msgstr "Préférences…"
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Toolbar.vala:65
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Toolbar.vala:84
+msgid "<b>Topic:</b> "
+msgstr "<b>Sujet :</b> "
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Channel.vala:61
+msgid "Leave Channel"
+msgstr "Quitter le canal"
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:395
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:407
+msgid "Mark Away"
+msgstr "Signaler comme absent"
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:396
+msgid "Leave All Channels"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:403
+#: /home/tutebatti/internal-stuff/po/../src/Services/Identity.vala:90
+#, c-format
+msgid "%s is away."
+msgstr "%s est absent."
+
+#: /home/tutebatti/internal-stuff/po/../src/Widgets/Server.vala:404
+msgid "Mark Present"
+msgstr "Signaler comme présent"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:48
+msgid "johndoe"
+msgstr "jeandupond"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:53
+msgid "John Doe"
+msgstr "Jean Dupond"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:57
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:63
+msgid "Good night everyone!"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:60
+msgid "Try again later!"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:65
+msgid "Nick Name:"
+msgstr "Surnom :"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:67
+msgid "Real Name:"
+msgstr "Nom réel :"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:69
+msgid "Part Message:"
+msgstr "Message d'au-revoir :"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:71
+msgid "Away Message:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:73
+msgid "Quit Message:"
+msgstr ""
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:96
+msgid "Add Identity"
+msgstr "Ajouter une identité"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageIdentity.vala:96
+msgid "Edit Identity"
+msgstr "Modifier l'identité"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:44
 msgid "irc.network.net"
 msgstr "irc.reseau.net"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:47
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:47
 msgid "Network IRC"
 msgstr "Réseau IRC"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:49
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:49
 msgid "Optional"
 msgstr "Facultatif"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:53
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:53
 msgid "Address:"
 msgstr "Addresse :"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:55
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:55
 msgid "Name:"
 msgstr "Nom :"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:57
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:57
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:77
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:77
 msgid "Add Network"
 msgstr "Ajouter un réseau"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageNetwork.vala:78
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/ManageNetwork.vala:78
 msgid "Change Network"
 msgstr "Changer de réseau"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:30
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/JoinChannel.vala:26
+msgid "Join Channel"
+msgstr "Rejoindre le canal"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:23
+msgid "Preferences"
+msgstr "Préférences"
+
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:30
 msgid "Networks"
 msgstr "Réseaux"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:31
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:31
 msgid "Identities"
 msgstr "Identitées"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:46
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:46
 msgid "Name"
 msgstr "Nom"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:47
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:47
 msgid "Address"
 msgstr "Addresse"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:66
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:69
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:66
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:69
 msgid "Add…"
 msgstr "Ajouter…"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:67
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:70
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:158
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:161
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:67
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:70
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:152
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:155
 msgid "Remove"
 msgstr "Supprimer"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:137
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:131
 msgid "Nick"
 msgstr "Surnom"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:138
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:132
 msgid "Real Name"
 msgstr "Nom réel"
 
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:157
-#: /home/gotwig/cable/po/../src/Dialogs/Preferences.vala:160
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:151
+#: /home/tutebatti/internal-stuff/po/../src/Dialogs/Preferences.vala:154
 msgid "Add"
 msgstr "Ajouter"
 
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:44
-msgid "johndoe (Without spaces/special characters)"
-msgstr ""
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:47
-msgid "John Doe"
-msgstr "Jean Dupond"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:49
-msgid "Good night everyone !"
-msgstr "Bonne nuit tout le monde !"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:51
-msgid "Nick Name:"
-msgstr "Surnom :"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:53
-msgid "Real Name:"
-msgstr "Nom réel :"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:55
-msgid "Part Message:"
-msgstr "Message d'au-revoir :"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:75
-msgid "Add Identity"
-msgstr "Ajouter une identité"
-
-#: /home/gotwig/cable/po/../src/Dialogs/ManageIdentity.vala:76
-msgid "Edit Identity"
-msgstr "Modifier l'identité"
-
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:75
+#: /home/tutebatti/internal-stuff/po/../src/Services/Identity.vala:88
 msgid "Bye."
 msgstr "Au revoir."
 
-#: /home/gotwig/cable/po/../src/Services/Identity.vala:76
+#: /home/tutebatti/internal-stuff/po/../src/Services/Identity.vala:89
 msgid "Quit server."
 msgstr "Quitte le serveur."
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid "Select a Channel to join and begin to talk."
+#~ msgstr "Sélectionner un salon pour commencer à discuter"
+
+#~ msgid "Leave all channels"
+#~ msgstr "Quitter tout les canaux"
+
+#~ msgid "Loading Topic…"
+#~ msgstr "Chargement du sujet…"
+
+#~ msgid "Good night everyone !"
+#~ msgstr "Bonne nuit tout le monde !"

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2013-07-14 15:58:58 +0000
+++ src/Cable.vala	2013-08-11 12:01:40 +0000
@@ -10,7 +10,7 @@
     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,
@@ -22,6 +22,30 @@
  */
 public class Cable.App : Granite.Application {
 
+    static bool option_reset = false;
+    static bool option_version = false;
+    static bool option_test = false;
+    
+    static const OptionEntry[] option_entries = {
+        { "reset", 0, 0, OptionArg.NONE, ref option_reset,
+          N_("Reset all settings and configuration to default"), null },
+
+        { "version", 0, 0, OptionArg.NONE, ref option_version,
+          N_("Print the version number"), null },
+
+        { "unit-test", 0, 0, OptionArg.NONE, ref option_test,
+          N_("Run unit tests"), null },
+
+        { null }
+    };
+    
+    static Gee.ArrayList <Controller.Window> controllers {
+        get; set;
+        default = new Gee.ArrayList <Controller.Window> ();
+    }
+
+    public static const string TITLE = "Cable";
+
     construct {
         build_data_dir = Constants.DATADIR;
         build_pkg_data_dir = Constants.PKGDATADIR;
@@ -35,7 +59,7 @@
         app_years = "2012-2013";
         app_icon = "internet-chat";
         app_launcher = "cable.desktop";
-        //application_id = "net.launchpad.cable";
+        application_id = "net.launchpad.cable";
 
         main_url = "https://code.launchpad.net/cable";
         bug_url = "https://bugs.launchpad.net/cable";
@@ -53,43 +77,56 @@
     public App () {
         Granite.Services.Logger.initialize ("Cable");
         Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+
+        Notification.init ();
+        Launcher.init ();
+        Settings.init ();
+        Utils.init ();
+        Irc.init ();
     }
 
     public override void activate () {
-        var window = new Cable.Window (this);
-        this.add_window (window);
-        window.show ();
+        var window = new Widgets.Window (this);
+        var controller = new Controller.Window (window);
+
+        add_window (window);
+        controllers.add (controller);
     }
-
-    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);
-        
-        Notify.init ("Cable");
-    
-        // libunity support
-        Cable.Services.unity = new Cable.Services.Unity ("cable.desktop");
+        var context = new GLib.OptionContext ("");
+        context.set_help_enabled (true);
+        context.add_main_entries (option_entries, Constants.GETTEXT_PACKAGE);
 
         try {
             context.parse (ref args);
-        }
-        catch (Error e) {
-            print (e.message + "\n");
-        }
+        } catch (GLib.OptionError e) {
+            warning (e.message);
+            warning ("Run '%s --help' to see a full list of available command line options.\n", args[0]);
+            return 0;
+        }
+
+        if (option_version) {
+            // XXX
+        }
+
+        if (option_reset) {
+            // XXX
+        }
+        
+        if (option_test) {
+            return Tests.run (args);
+        }
+        
 
         var cable = new Cable.App ();
         return cable.run (args);
     }
-    
-    internal void translations () {
+
+    /*internal void translations () {
         var description = N_("Stylish IRC Client");
         var generic = N_("IRC Client");
-    }
+    }*/
 }
 
+

=== added directory 'src/Controller'
=== added file 'src/Controller/Channel.vala'
--- src/Controller/Channel.vala	1970-01-01 00:00:00 +0000
+++ src/Controller/Channel.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,170 @@
+internal class Cable.Controller.Channel : GLib.Object {
+
+    internal weak Server server;
+    internal View.Channel view;
+    internal Irc.Channel backend;
+    
+    internal string name; //TODO id
+
+    internal Channel (Server server, string name) {
+debug (@"+ CONTROLLER CHANNEL $name");
+        this.server = server;
+        this.name = name;
+
+        if (server.view.has_channel (name) == false)
+            server.view.add_channel (name, name);
+
+        view = server.view.get_channel_by_id (name);
+        view.nick = server.nick;
+        backend = new Irc.Channel (name, server.backend);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+
+        load_state ();
+    }
+
+    ~Channel () { debug (@"- CONTROLLER CHANNEL $name"); }
+
+    void load_state () {
+        /*if (backend.joined) {
+            view.room.state = Widgets.Room.State.CHAT;
+            FIXME some bug in maki returns garbage here:
+            -> view.room.list_users (backend.nicks, backend.prefixes);
+            backend.event_topic (backend.topic, "");
+        } else {
+            view.room.state = Widgets.Room.State.JOINING;
+        }*/
+        // part and rejoin to workaround bug
+        view.state = State.JOINING;
+
+        if (server.backend.connected == false) {
+            server.backend.event_connected.connect (() => {
+                if (backend.joined)
+                    backend.send_part ();
+                backend.send_join ();
+            });
+        } else {
+            if (backend.joined)
+                backend.send_part ();
+            backend.send_join ();
+        }
+    }
+
+    void connect_frontend_signals () {
+
+        view.part.connect (() => {
+            backend.send_part ();
+        });
+
+        server.window.view.selected.connect ((item) => {
+            if (item == view)
+                view.unread_messages = 0;
+        });
+
+        view.join.connect (() => {
+            view.state = State.JOINING;
+            backend.send_join ();
+        });
+
+        view.send_message.connect ((message) => {
+            if (message.has_prefix ("/"))
+                server.backend.send_raw (message.replace ("/", ""));
+            else
+                server.backend.send_message (name, message);
+
+            view.entry = "";
+        });
+
+        view.focused.connect (() => {
+            Launcher.jobs = 0;
+            Launcher.urgent = false;
+            return false;
+        });
+
+    }
+
+    void connect_backend_signals () {
+        backend.event_message.connect ((from, message) => {
+            if (server.window.view.current_channel != view)
+                view.unread_messages++;
+        });
+
+        backend.event_topic.connect ((from, topic) => {
+            view.topic = topic;
+        });
+
+        server.backend.event_nick.connect ((from, new_nick) => {
+            if (server.backend.is_me (from)) {
+                view.nick = new_nick;
+            }
+            
+            assert (new_nick != null);
+
+            var name = from.split ("!")[0];
+
+            if (!view.has_user (name))
+                return;
+
+            if (name.has_prefix ("@"))
+                view.rename_user (name.replace ("@", ""), new_nick, UserType.OPERATOR);
+            else if (name.has_prefix ("+"))
+                view.rename_user (name.replace ("+", ""), new_nick, UserType.VOICED);
+            else
+                view.rename_user (name, new_nick, UserType.REGULAR);
+        });
+
+        backend.event_part.connect ((from, message) => {
+            if (server.backend.is_me (from)) {
+               view.state = State.NOT_JOINED;
+            } else {
+                var name = from.split ("!")[0];
+
+                if (name.has_prefix ("@"))
+                    view.remove_user (name.replace ("@", ""), message);
+                else if (name.has_prefix ("+"))
+                    view.remove_user (name.replace ("+", ""), message);
+                else
+                    view.remove_user (name, message);
+            }
+        });
+
+        backend.event_join.connect ((from) => {
+            if (server.backend.is_me (from)) {
+                view.state = State.CHAT;
+            } else {
+                var name = from.split ("!")[0];
+
+                if (name.has_prefix ("@"))
+                    view.add_user (name.replace ("@", ""), UserType.OPERATOR);
+                else if (name.has_prefix ("+"))
+                    view.add_user (name.replace ("+", ""), UserType.VOICED);
+                else
+                    view.add_user (name, UserType.REGULAR);
+            }
+        });
+
+        backend.event_no_such.connect (() => {
+            view.state = State.NO_SUCH;
+        });
+
+        backend.event_message.connect ((from, message) => {
+            var nick = from.split ("!") [0];
+
+            if (message.contains (server.nick)) {
+
+                if (view.has_focus == false) {
+                    Notification.send (nick, message);
+                    Launcher.jobs++;
+                    Launcher.urgent = true;
+                }
+
+                view.message (nick, message, MessageType.PING);
+            } else {
+                view.message (nick, message);
+            }
+        });
+
+        backend.event_names.connect (view.list_users);
+    }
+}

=== added file 'src/Controller/Server.vala'
--- src/Controller/Server.vala	1970-01-01 00:00:00 +0000
+++ src/Controller/Server.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,65 @@
+internal class Cable.Controller.Server : GLib.Object {
+
+    internal weak Window window;
+    internal View.Server view;
+    internal Irc.Server backend;
+    
+    internal string nick; // FIXME not reliable
+    internal string address; // FIXME not reliable
+    internal string name;
+
+    internal Gee.HashMap <string, Channel> channels {
+        get; set;
+        default = new Gee.HashMap <string, Channel>  ();
+    }
+
+    internal Server (string address, string nick, Window window) {
+    debug (@"+ CONTROLLER SERVER $address");
+        this.backend = Irc.Server.get_or_create (address, nick);
+
+        this.name = backend.name;
+        this.window = window;
+        this.nick = nick;
+        this.address = address;
+        
+        if (!backend.connected)
+            backend.send_connect ();
+
+        this.view = window.view.add_server (@"$(backend.network.name) - $(nick)", backend.name);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+    }
+    
+    ~Server () { debug (@"- CONTROLLER SERVER $address"); }
+    
+    void connect_frontend_signals () {
+        view.toggle_away.connect (() =>  {
+            if (backend.away) {
+                backend.send_back ();
+            } else {
+                backend.send_away ();
+            }
+        });
+
+        view.part_all.connect (() => {
+            foreach (var channel in channels.values)
+                channel.backend.send_part ();
+        });
+    }
+    
+    void connect_backend_signals () {
+        backend.event_user_away.connect ((from, away) => {
+            if (backend.is_me (from)) {
+                view.away = away;
+            }
+        });
+        
+        backend.event_quit.connect ((from, message) => {
+            var nick = from.split ("!")[0];
+            
+            foreach (var channel in channels.values)
+                channel.view.remove_user (nick, message);
+        });
+    }
+}

=== added file 'src/Controller/Window.vala'
--- src/Controller/Window.vala	1970-01-01 00:00:00 +0000
+++ src/Controller/Window.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,163 @@
+internal class Cable.Controller.Window : GLib.Object {
+
+    internal View.Window view { get; set; }
+
+    internal Gee.HashMap <string, Server> servers {
+        get; set;
+        default = new Gee.HashMap <string, Server> ();
+    }
+
+    internal Window (View.Window window) {
+        GLib.Object (view: window);
+
+        connect_frontend_signals ();
+        connect_backend_signals ();
+        initialize ();
+    }
+
+    // restore saved state
+    void initialize () {
+        var channels = Settings.preferences.channels;
+
+        // check for joined channels
+        foreach (var server_name in Irc.Client.known_server_names) {
+            var server = new Irc.Server.from_name (server_name);
+            foreach (var channel in server.channel_names)
+                join_channel (server.address, server.nick, channel);
+        }
+
+        // check for channels from last session
+        if (channels.length > 0) {
+            foreach (var channel in channels) {
+                var parts = channel.split (":");
+                return_if_fail (parts.length == 3);
+                join_channel (parts[0], parts[1], parts[2]);
+            }
+        }
+
+        if (servers.size == 0)
+            view.welcome_shown = true;
+    }
+
+    // backend events that affect the window's state
+    void connect_backend_signals () {
+        Irc.client.event_nick.connect ((time, server, from, nick) => {
+            var current_channel = view.current_channel;
+            var current_server = view.current_server;
+
+            if (server == current_server.id)
+                view.title = string.join (" — ", current_channel.name, nick);
+        });
+    }
+
+    // frontend signals from the window
+    void connect_frontend_signals () {
+        view.selected.connect ((item) => {
+            if (item is View.Channel) {
+                var channel = item as View.Channel;
+                view.title = string.join (" — ", channel.name);
+            }
+        });
+
+        view.join.connect ((a,n,c) => {
+            join_channel (a,n,c);
+        });
+
+        view.remove_channel.connect (() => {
+            var channel_id = view.current_channel.id;
+            var server_id = view.current_server.id;
+
+            if (view.current_channel != null) {
+                part_channel (servers[server_id].channels[channel_id]);
+            } else {
+                warning ("No channel selected, cannot leave.");
+            }
+        });
+
+        view.add_channel.connect (() => {
+            var dialog = new Dialogs.JoinChannel ();
+            dialog.done.connect ((a,b,c) => join_channel (a.address,b.nick_name,c));
+            dialog.show_all ();
+        });
+
+        view.show_preferences.connect (() => {
+            var dialog = new Dialogs.Preferences ();
+            dialog.show_all ();
+        });
+
+        view.close.connect (() => {
+            string[] chans = {};
+
+            foreach (var server in servers.values) {
+                foreach (var channel in server.channels.values) {
+                    chans += string.join (":", server.address, server.nick, channel.name);
+                    channel.backend.send_part ();
+                }
+            }
+
+            Settings.preferences.channels = chans;
+        });
+    }
+
+    void join_channel (string address, string nick, string channel_name) {
+        Server server = null;
+        foreach (var s in servers.values)
+            if (s.address == address && s.nick == nick)
+                server = s;
+
+        if (server == null) {
+            server = new Server (address, nick, this);
+            servers[server.backend.name] = server;
+        }
+
+        if (server.view.has_channel (channel_name)) {
+            warning ("Channel is already joined");
+            return;
+        }
+
+        var channel = new Channel (server, channel_name);
+        server.channels[channel_name] = channel;
+        
+        view.current_channel = channel.view;
+        view.welcome_shown = false;
+    }
+
+    void part_channel (Channel channel) {
+        var server = channel.server;
+
+        channel.backend.send_part ();
+        server.view.remove_channel (channel.view.id);
+        server.channels.unset (channel.view.id);
+
+        if (server.channels.size == 0)
+            servers.unset (server.view.id);
+
+        if (servers.size == 0) {
+            view.title = App.TITLE;
+            view.welcome_shown = true;
+        }
+    }
+
+    /*void leave_channel (Settings.Network network, Settings.Identity identity, string channel_name) {
+        var server_backend = Irc.Server.search (network.address, identity.nick_name);
+
+        var server_view = servers[server_backend.name].view;
+
+        if (server_view == null) {
+            warning ("Cannot leave channel: server does not exist (%s - %s)", network.address, identity.nick_name);
+            return;
+        }
+        if (!server_view.has_channel (channel_name)) {
+            warning ("Cannot leave channel: channel not joined (%s)", channel_name);
+            return;
+        }
+
+        server_view.remove_channel (channel_name);
+        server_backend.send_part (channel_name);
+
+        if (view.n_servers == 0) {
+            view.title = App.TITLE;
+            view.welcome_shown = true;
+        }
+    }*/
+}

=== modified file 'src/Dialogs/JoinChannel.vala'
--- src/Dialogs/JoinChannel.vala	2013-07-04 01:34:38 +0000
+++ src/Dialogs/JoinChannel.vala	2013-08-11 12:01:40 +0000
@@ -19,7 +19,7 @@
 
 public class Cable.Dialogs.JoinChannel : Granite.Widgets.LightWindow {
 
-    public signal void done (Settings.Network network, Settings.Identity identity, string channel);
+    public signal void done (Utils.Network network, Utils.Identity identity, string channel);
     Gtk.Button connect_button;
 
     public JoinChannel () {
@@ -47,19 +47,20 @@
 
         // 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);
+        for (int i = 0; i < Utils.Network.all.size; i++)
+            server_entry.append (i.to_string (), Utils.Network.all[i].name);
         server_entry.active = 0;
 
         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);
+        for (int i = 0; i < Utils.Identity.all.size; i++)
+            id_entry.append (i.to_string (), Utils.Identity.all[i].nick_name);
         id_entry.active = 0;
 
         var channel_entry = new Gtk.Entry ();
         channel_entry.text = "#";
         channel_entry.grab_focus ();
         channel_entry.set_position (-1);
+        channel_entry.width_request = 250;
         
         channel_entry.insert_text.connect ((text) => {
             Utils.filter (channel_entry, text, {" ", ":"});
@@ -110,19 +111,19 @@
 
         connect_button.clicked.connect (() => channel_entry.activate ());
         channel_entry.activate.connect (() => {
-            Settings.Network network;
-            Settings.Identity identity;
+            Utils.Network network;
+            Utils.Identity identity;
 
             if (server_entry.active_id == null) {
-                network = new Settings.Network (server_entry.get_active_text ());
+                network = new Utils.Network (server_entry.get_active_text ());
             } else {
-                network = Settings.networks[int.parse (server_entry.active_id)];
+                network = Utils.Network.all[int.parse (server_entry.active_id)];
             }
             
             if (id_entry.active_id == null) {
-                identity = new Settings.Identity (id_entry.get_active_text ());
+                identity = new Utils.Identity (id_entry.get_active_text ());
             } else {
-                identity = Settings.identities[int.parse (id_entry.active_id)];
+                identity = Utils.Identity.all[int.parse (id_entry.active_id)];
             }
             
                         

=== modified file 'src/Dialogs/ManageIdentity.vala'
--- src/Dialogs/ManageIdentity.vala	2013-07-04 14:06:39 +0000
+++ src/Dialogs/ManageIdentity.vala	2013-08-11 12:01:40 +0000
@@ -25,13 +25,17 @@
     /**
      * @param identity Resulting identity.
      */
-    public signal void done (Settings.Identity identity);
+    public signal void done (Utils.Identity identity);
 
     /**
      * @param identity Identity to be edited or null if you want to create
      * a new one.
      */
-    public ManageIdentity (Settings.Identity? identity = null) {
+    public ManageIdentity (Utils.Identity? identity = null) {
+    
+        var new_identity = identity == null;
+        var in_use = (new_identity) ? false : identity.servers.size > 0;
+        
         this.modal = true;
         this.window_position = Gtk.WindowPosition.CENTER;
         
@@ -43,55 +47,79 @@
         var nick_name = new Gtk.Entry ();
         nick_name.placeholder_text = _("johndoe (Without spaces/special characters)");
         nick_name.width_request = 250;
+        nick_name.sensitive = !in_use;
+        
         var real_name = new Gtk.Entry ();
         real_name.placeholder_text = _("John Doe");
+        real_name.sensitive = !in_use;
+        
         var part_message = new Gtk.Entry ();
-        part_message.placeholder_text = _("Good night everyone !");
+        part_message.placeholder_text = _("Good night everyone!");
+        
+        var away_message = new Gtk.Entry ();
+        away_message.placeholder_text = _("Try again later!");
+        
+        var quit_message = new Gtk.Entry ();
+        quit_message.placeholder_text = _("Good night everyone!");
 
-        grid.attach (new Utils.Label.right (_("Nick Name:")), 0, 0, 1, 1);
+        grid.attach (new Utils.Label.right (_("Nick Name:"), !in_use), 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 (new Utils.Label.right (_("Real Name:"), !in_use), 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);
+        grid.attach (new Utils.Label.right (_("Away Message:")), 0, 3, 1, 1);
+        grid.attach (away_message, 1, 3, 1, 1);
+        grid.attach (new Utils.Label.right (_("Quit Message:")), 0, 4, 1, 1);
+        grid.attach (quit_message, 1, 4, 1, 1);
 
         var cancel_button = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
         Gtk.Button apply_button;
-        if (identity == null) {
+        
+        if (new_identity) {
             apply_button = new Gtk.Button.from_stock (Gtk.Stock.ADD);
             apply_button.get_style_context ().add_class ("affirmative");
-        } else
+        } else {
             apply_button = new Gtk.Button.from_stock (Gtk.Stock.APPLY);
-        apply_button.sensitive = (identity != null);
+        }
+        
+        apply_button.sensitive = !new_identity;
         
         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);
+        grid.attach (button_box, 0, 5, 2, 1);
 
         this.add (grid);
-        this.title = (identity == null) ? _("Add Identity")
-                                        : _("Edit Identity");
+        this.title = (new_identity) ? _("Add Identity") : _("Edit Identity");
 
-        if (identity != null) {
+        if (!new_identity) {
             nick_name.text = identity.nick_name;
             real_name.text = identity.real_name;
             part_message.text = identity.part_message;
+            away_message.text = identity.away_message;
+            quit_message.text = identity.quit_message;
         }
 
         nick_name.changed.connect (() => {
             apply_button.sensitive = (nick_name.text != "");
         });
 
+        nick_name.activate.connect (() => apply_button.clicked);
+        real_name.activate.connect (() => apply_button.clicked);
+        part_message.activate.connect (() => apply_button.clicked);
+        away_message.activate.connect (() => apply_button.clicked);
+        quit_message.activate.connect (() => apply_button.clicked);
+        
         apply_button.clicked.connect (() => {
-            if (identity == null) {
+            if (new_identity) {
                 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 ();
+                identity.away_message = away_message.text.strip ();
+                identity.quit_message = quit_message.text.strip ();
                 done (identity);
             }
             
@@ -103,18 +131,17 @@
         });
     }
 
-    Settings.Identity create_identity (string nick_name, string real_name,
-                                       string part_message)
+    static Utils.Identity create_identity (string nick_name, string real_name, string part_message)
         requires (nick_name.strip () != "") {
 
         if (nick_name.strip () == "")
-            return (Settings.Identity) null;
+            return (Utils.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);
+        return new Utils.Identity (nick_name, real_name, part_message);
     }
 }

=== modified file 'src/Dialogs/ManageNetwork.vala'
--- src/Dialogs/ManageNetwork.vala	2013-07-04 01:34:38 +0000
+++ src/Dialogs/ManageNetwork.vala	2013-08-11 12:01:40 +0000
@@ -25,13 +25,16 @@
     /**
      * @param network Resulting network.
      */
-    public signal void done (Settings.Network network);
+    public signal void done (Utils.Network network);
 
     /**
      * @param network Network to be edited or null if you want to create
      * a new one.
      */
-    public ManageNetwork (Settings.Network? network = null) {
+    public ManageNetwork (Utils.Network? network = null) {
+        var new_network = network == null;
+        var in_use = (new_network) ? false : network.servers.size > 0;
+    
         this.modal = true;
         this.window_position = Gtk.WindowPosition.CENTER;
         
@@ -43,14 +46,17 @@
         var address = new Gtk.Entry ();
         address.placeholder_text = _("irc.network.net");
         address.width_request = 250;
+        address.sensitive = !in_use;
+        
         var name = new Gtk.Entry ();
         name.placeholder_text = _("Network IRC");
+        
         var password = new Gtk.Entry ();
         password.placeholder_text = _("Optional");
         password.caps_lock_warning = true;
         password.set_visibility (false);
 
-        grid.attach (new Utils.Label.right (_("Address:")), 0, 0, 1, 1);
+        grid.attach (new Utils.Label.right (_("Address:"), !in_use), 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);
@@ -59,11 +65,14 @@
 
         var cancel_button = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
         Gtk.Button apply_button;
+        
         if (network == null) {
             apply_button = new Gtk.Button.from_stock (Gtk.Stock.ADD);
             apply_button.get_style_context ().add_class ("affirmative");
-        } else
+        } else {
             apply_button = new Gtk.Button.from_stock (Gtk.Stock.APPLY);
+        }
+        
         apply_button.sensitive = (network != null);
         
         var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
@@ -74,8 +83,7 @@
         grid.attach (button_box, 0, 3, 2, 1);
 
         this.add (grid);
-        this.title = (network == null) ? _("Add Network")
-                                        : _("Change Network");
+        this.title = (network == null) ? _("Add Network") : _("Edit Network");
 
         if (network != null) {
             address.text = network.address;
@@ -91,11 +99,11 @@
             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 ();
         });
         
@@ -104,18 +112,17 @@
         });
     }
 
-    Settings.Network create_network (string address, string name,
-                                       string password)
+    Utils.Network create_network (string address, string name, string password)
         requires (address.strip () != "") {
 
         if (address.strip () == "")
-            return (Settings.Network) null;
+            return (Utils.Network) null;
 
         if (name.strip () == "")
             name = null;
         if (password.strip () == "")
             password = null;
 
-        return new Settings.Network (address, name, password);
+        return new Utils.Network (address, name, password);
     }
 }

=== modified file 'src/Dialogs/Preferences.vala'
--- src/Dialogs/Preferences.vala	2013-07-04 01:34:38 +0000
+++ src/Dialogs/Preferences.vala	2013-08-11 12:01:40 +0000
@@ -38,13 +38,14 @@
 
     public NetworkPrefs () {
         var tree = new Gtk.TreeView ();
-        var scroll = new Gtk.ScrolledWindow(null, null);
+        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);
+        tree.insert_column_with_attributes (-1, _("Used"), cell, "text", 2);
 
         scroll.set_size_request (300, 300);
         scroll.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
@@ -63,27 +64,28 @@
         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 add_button = new Gtk.ToolButton (null, _("Add…"));
         var remove_button = new Gtk.ToolButton (null, _("Remove"));
+        var edit_button = new Gtk.ToolButton (null, _("Edit…"));
 
         add_button.set_tooltip_text (_("Add…"));
         remove_button.set_tooltip_text (_("Remove"));
-
+        edit_button.set_tooltip_text (_("Edit…"));
+        
         add_button.set_icon_name ("list-add-symbolic");
         remove_button.set_icon_name ("list-remove-symbolic");
-
+        edit_button.set_icon_name ("document-properties-symbolic");
+        
         toolbar.insert (add_button, -1);
         toolbar.insert (remove_button, -1);
+        //TODO toolbar.insert (edit_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.done.connect ((network) => this.sync (tree));
             dialog.show_all ();
         });
 
@@ -95,29 +97,27 @@
                 return;
 
             var index = path.get_indices ()[0];
-            Settings.networks.remove (Settings.networks[index]);
+            Utils.Network.remove (Utils.Network.all[index].address);
             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);
-            });
+            var dialog = new Dialogs.ManageNetwork (Utils.Network.all[index]);
+            dialog.done.connect (() => this.sync (tree));
             dialog.show_all ();
         });
     }
 
     private void sync (Gtk.TreeView tree) {
-        var store = new Gtk.ListStore (2, typeof (string), typeof (string));
+        var store = new Gtk.ListStore (3, typeof (string), typeof (string), typeof (string));
 
         Gtk.TreeIter iter;
 
-        foreach (var network in Settings.networks) {
+        foreach (var network in Utils.Network.all) {
+            var in_use = network.servers.size > 0 ? "Used" : "";
             store.append (out iter);
-            store.set (iter, 0, network.name, 1, network.address, -1);
+            store.set (iter, 0, network.name, 1, network.address, 2, in_use, -1);
         }
 
         tree.model = store;
@@ -127,7 +127,6 @@
  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);
 
@@ -171,10 +170,7 @@
 
         add_button.clicked.connect (() => {
             var dialog = new Dialogs.ManageIdentity ();
-            dialog.done.connect ((identitie) => {
-                Settings.identities.add (identitie);
-                this.sync (tree);
-            });
+            dialog.done.connect (() => this.sync (tree));
             dialog.show_all ();
         });
 
@@ -186,17 +182,14 @@
                 return;
 
             var index = path.get_indices ()[0];
-            Settings.identities.remove (Settings.identities[index]);
+            Utils.Identity.remove (Utils.Identity.all[index].nick_name);
             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);
-            });
+            var dialog = new Dialogs.ManageIdentity (Utils.Identity.all[index]);
+            dialog.done.connect (() => this.sync (tree));
             dialog.show_all ();
         });
     }
@@ -206,7 +199,7 @@
 
         Gtk.TreeIter iter;
 
-        foreach (var identity in Settings.identities) {
+        foreach (var identity in Utils.Identity.all) {
             store.append (out iter);
             store.set (iter, 0, identity.nick_name, 1, identity.real_name, -1);
         }

=== added directory 'src/Irc'
=== added file 'src/Irc/Channel.vala'
--- src/Irc/Channel.vala	1970-01-01 00:00:00 +0000
+++ src/Irc/Channel.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,322 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Irc.Channel : GLib.Object {
+
+    public Irc.Server server { get; private set; }
+
+    public string name { get; private set; }
+
+    string _topic = "";
+    public string topic {
+        get {
+            try {
+                _topic = client.channel_topic (server.name, this.name);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _topic;
+        }
+    }
+
+    string[] _nicks = {};
+    public string[] nicks {
+        get {
+            try {
+                client.channel_nicks (server.name, this.name, out _nicks, out _prefixes);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _nicks;
+        }
+    }
+
+    string[] _prefixes = {};
+    public string[] prefixes {
+        get {
+            try {
+                client.channel_nicks (server.name, this.name, out _nicks, out _prefixes);
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            return _prefixes;
+        }
+    }
+
+    public bool joined {
+        get { return name in server.channel_names; }
+    }
+
+    public signal void event_banlist (string mask, string who, int64 when); // TODO wtf is this?
+
+    /**
+     * You failed to join this channel.
+     * @param reason Reason you were unable to join this channel.
+     */
+    public signal void event_cannot_join (string reason);
+    public signal void event_invite (string from, string who); // TODO makes more sense in server!?
+
+    /**
+     * Someone joined the channel.
+     * @param from User that joined the channel.
+     */
+    public signal void event_join (string from);
+
+    /**
+     * A user has been kicked from the channel.
+     * @param from User who kicked someone.
+     * @param who User that was kicked.
+     * @param message Reason given why the user was kicked.
+     */
+    public signal void event_kick (string from, string who, string message);
+    public signal void event_list (int64 users, string topic); // TODO does this belong?
+
+    public signal void event_message (string from, string message);
+
+    /**
+     * All nicks and respective prefixes have been returned by the server.
+     * @param nicks List of all nick names of all users in the channel.
+     * @param prefixes Respective nick prefixes like "@" or "+".
+     */
+    public signal void event_names (string[] nicks, string[] prefixes);
+
+    /**
+     * No such channel exists.
+     */
+    public signal void event_no_such ();
+
+    /**
+     * Someone has left the channel.
+     * @param from User that left the channel.
+     * @param message Part message displayed to all users in the channel.
+     */
+    public signal void event_part (string from, string message);
+
+    /**
+     * Topic has been changed.
+     * @param from User that changed the topic.
+     * @param topic The new topic.
+     */
+    public signal void event_topic (string from, string topic);
+
+    public Channel (string channel_name, Server server) {
+    debug (@"+ IRC CHANNEL $channel_name");
+        this.name = channel_name;
+        this.server = server;
+
+        setup_signals ();
+    }
+    
+    ~Channel () { debug (@"- IRC CHANNEL $name"); }
+
+    /**
+     * Send a message displayed in "third person"
+     * @param message The message to be sent.
+     */
+    public void send_action (string message) {
+        try {
+            client.action (server.name, name, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Invite a person to join this channel.
+     * @param who Nick name of the person to invite.
+     */
+    public void send_invite (string who) {
+        try {
+            client.invite (server.name, name, who);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Join this channel.
+     * @param key Password to this channel. Should be "" if there is no password.
+     */
+    public void send_join (string key = "") {
+        try {
+            client.join (server.name, name, key);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Kick a user from the channel. Requires operator privileges.
+     * @param who Nick name of the user to be kicked.
+     * @param message Reason why the user has been kicked.
+     */
+    public void send_kick (string who, string message) {
+        try {
+            client.kick (server.name, name, who, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Request topic and number of users for this channel TODO move somewhere else
+     */
+    public void send_list () {
+        try {
+            client.list (server.name, name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Send a normal message in this channel.
+     * @param message The message.
+     */
+    public void send_message (string message) {
+        try {
+            client.message (server.name, name, message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Request a list of names from the channel.
+     */
+    public void send_names () {
+        try {
+            client.names (server.name, name);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Leave this channel.
+     * @param message Part message to be displayed. If null it will be fetched from the identity.
+     */
+    public void send_part (string? message = null) {
+        try {
+            client.part (server.name, name, message ?? server.identity.part_message);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Change or request the channel's topic.
+     * @param topic The new topic, or "" if you just want to query the current topic.
+     */
+    public void send_topic (string topic = "") {
+        try {
+            client.topic (server.name, name, topic);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+    }
+
+    /**
+     * Get the channel mode for a given user.
+     * @param nick Nick name of the user.
+     */
+    public string user_channel_mode (string nick) {
+        try {
+            return client.user_channel_mode (server.name, name, nick);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+        
+        return "";
+    }
+
+    /**
+     * Get the channel prefix ("@", "+") of a given user.
+     * @param nick Nick name of the user.
+     */
+    public string user_channel_prefix (string nick) {
+        try {
+            return client.user_channel_prefix (server.name, name, nick);
+        } catch (GLib.IOError error) {
+            warning (error.message);
+        }
+        
+        return "";
+    }
+    
+    void setup_signals () {
+        client.event_banlist.connect ((time, server, channel, mask, who, when) => {
+            if (server == this.server.name && name == channel)
+                event_banlist (mask, who, when);
+        });
+
+        client.event_cannot_join.connect ((time, server, channel, reason) => {
+            if (server == this.server.name && name == channel)
+                event_cannot_join (reason);
+        });
+
+        client.event_invite.connect ((time, server, from, channel, who) => {
+            if (server == this.server.name && name == channel)
+                event_invite (from, who);
+        });
+
+        client.event_join.connect ((time, server, from, channel) => {
+            if (server == this.server.name && name == channel)
+                event_join (from);
+        });
+
+        client.event_kick.connect ((time, server, from, channel, who, message) => {
+            if (server == this.server.name && name == channel)
+                event_kick (from, who, message);
+        });
+
+        client.event_list.connect ((time, server, channel, users, topic) => {
+            if (server == this.server.name && name == channel)
+                event_list (users, topic);
+        });
+        
+        client.event_message.connect ((time, server, from, target, message) => {
+            if (server == this.server.name && name == target)
+                event_message (from, message);
+        });
+
+        client.event_names.connect ((time, server, channel, nicks, prefixes) => {
+            if (server == this.server.name && name == channel)
+                event_names (nicks, prefixes);
+        });
+
+        client.event_no_such.connect ((time, server, target, type) => {
+            if (server == this.server.name && name == target && type == "c")
+                event_no_such ();
+        });
+
+        client.event_part.connect ((time, server, from, channel, message) => {
+            if (server == this.server.name && name == channel)
+                event_part (from, message);
+        });
+
+        client.event_topic.connect ((time, server, from, channel, topic) => {
+            if (server == this.server.name && name == channel)
+                event_topic (from, topic);
+        });
+    }
+}

=== added file 'src/Irc/Client.vala'
--- src/Irc/Client.vala	1970-01-01 00:00:00 +0000
+++ src/Irc/Client.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,59 @@
+/***
+    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.Irc.Client : GLib.Object {
+
+    /**
+     * Names of the servers we are currently connected to.
+     */
+    public static string[] server_names {
+        owned get {
+            try {
+                return client.servers ();
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+            
+            return {};
+        }
+    }
+    
+    /**
+     * All known servers.
+     */
+    public static string[] known_server_names {
+        owned get {
+            try {
+                return client.server_list ("", "");
+            } catch (GLib.IOError e) {
+                warning (e.message);
+            }
+            
+            return {};
+        }
+    }
+
+    /*public static string config_get (string group, string key) throws GLib.IOError {
+        return client.config_get (group, key);
+    }
+
+    public static void config_set (string group, string key, string value) throws GLib.IOError {
+        client.action (group, key, value);
+    }*/
+}

=== added file 'src/Irc/Irc.vala'
--- src/Irc/Irc.vala	1970-01-01 00:00:00 +0000
+++ src/Irc/Irc.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,43 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Namespace for all IRC backend related classes.
+ */
+namespace Cable.Irc {
+
+    /**
+     * Static reference to the maki interface.
+     */
+    Maki client = null;
+    
+    public void init () {
+        if (client == null) {
+            try {
+                client = Bus.get_proxy_sync (GLib.BusType.SESSION, "de.ikkoku.sushi", "/de/ikkoku/sushi");
+            } catch (GLib.IOError error) {
+                warning (error.message);
+            }
+            
+            debug ("Successfully connected to Sushi dbus session.\n");
+        }
+        
+        Server.init ();
+    }
+}

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

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

=== removed file 'src/Services/Client.vala'
--- src/Services/Client.vala	2013-06-25 12:47:28 +0000
+++ src/Services/Client.vala	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * This is a dbus interface to the maki daemon from the SushiIRC project.
- * Use the methods to send requests or messages to the server and the
- * signals to react to the server's replies.
- *
- * 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);
-}

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

=== removed file 'src/Services/Network.vala'
--- src/Services/Network.vala	2013-07-04 01:34:38 +0000
+++ src/Services/Network.vala	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * This 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 = all;
-
-        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/Notification.vala'
--- src/Services/Notification.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Notification.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,48 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Static class to deal with notifications.
+ */
+public class Cable.Notification : GLib.Object {
+
+    /**
+     * Initialize Notify. Only call this once.
+     */
+    public static void init () {
+        if (Notify.is_initted ()) {
+            warning ("Trying to reinitialize Notify.");
+            return;
+        }
+
+        Notify.init ("Cable");
+    }
+
+    /**
+     * Send a notfication.
+     */
+    public static void send (string summary, string body) {
+        var notify = new Notify.Notification (summary, body, "internet-chat");
+        try {
+            notify.show ();
+        } catch (Error e) {
+            warning (e.message);
+        }
+    }
+}

=== removed file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2013-07-04 01:34:38 +0000
+++ src/Services/Settings.vala	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-/**
- * 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 ();
-        Identity.init ();
-    }
-}
- 
- /*
-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/Services/Unity.vala'
--- src/Services/Unity.vala	2013-07-14 15:58:58 +0000
+++ src/Services/Unity.vala	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-  BEGIN LICENSE
-
-  Copyright (C) 2013 Mario Guerriero <[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
-***/
-
-using Unity;
-
-namespace Cable.Services {
-    
-    public Unity unity;
-    
-    public class Unity : GLib.Object {
-        
-        private int jobs = 0;
-        private LauncherEntry launcher_entry;
-        
-        public Unity (string desktop_id) {
-            launcher_entry = LauncherEntry.get_for_desktop_id (desktop_id);
-        }
-        
-        public void set_progress (double percentage) {
-            // If it is not 100 % show it
-            launcher_entry.progress = (percentage/jobs);
-            launcher_entry.progress_visible = true;
-        }
-        
-        // Add new red badge to show the number of pending works
-        public void append_job () {
-            jobs++;
-            
-            launcher_entry.count = jobs;
-            launcher_entry.count_visible = (jobs > 0);
-        }
-        
-        public void remove_job () {
-            jobs--;
-            
-            launcher_entry.count = jobs;
-            launcher_entry.count_visible = (jobs > 0);
-        }
-        
-        public void clear () {
-            jobs = 0;
-            launcher_entry.count = jobs;
-            launcher_entry.count_visible = false;
-            launcher_entry.progress_visible = false;
-        }
-    }
-}

=== added directory 'src/Settings'
=== added file 'src/Settings/Preferences.vala'
--- src/Settings/Preferences.vala	1970-01-01 00:00:00 +0000
+++ src/Settings/Preferences.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,39 @@
+public class Cable.Settings.Preferences : Granite.Services.Settings {
+
+    public string[] networks { get; set; }
+    public string[] identities { get; set; }
+    public string[] channels { get; set; }
+
+    public Preferences () {
+        base ("org.pantheon.cable");
+    }
+
+    /*public override void verify (string key) {
+        switch (key) {
+        
+            case "networks":
+                string[] new_value = {};
+
+                foreach (var network in networks)
+                    if (network.split (":").length == 3)
+                        new_value += network;
+
+                if (networks != new_value)
+                    networks = new_value;
+
+                break;
+
+            case "identities":
+                string[] new_value = {};
+
+                foreach (var identity in identities)
+                    if (identity.split (":").length == 3)
+                        new_value += identity;
+
+                if (identities != new_value)
+                    identities = new_value;
+
+                break;
+        }
+    }*/
+}

=== added file 'src/Settings/SavedState.vala'
=== added file 'src/Settings/Settings.vala'
--- src/Settings/Settings.vala	1970-01-01 00:00:00 +0000
+++ src/Settings/Settings.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,33 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+/**
+ * Namespace for accessing the app's gsettings. May be used by any part of the app.
+ */
+namespace Cable.Settings {
+
+    public static Settings.Preferences preferences;
+
+    /**
+     * Load values from gsettings.
+     */
+    public static void init () {
+        preferences = new Settings.Preferences ();
+    }
+}

=== added directory 'src/Tests'
=== added file 'src/Tests/Tests.vala'
--- src/Tests/Tests.vala	1970-01-01 00:00:00 +0000
+++ src/Tests/Tests.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,13 @@
+namespace Cable.Tests {
+
+    public int run (string[] args) {
+        /*Test.init (ref args);
+        
+        Test.add_func ("/Utils/Markup", (TestFunc) Utils.test_markup);
+        Test.add_func ("/Utils/Network", (TestFunc) Utils.test_networks);
+        Test.add_func ("/Utils/Identity", (TestFunc) Utils.test_identities);
+        
+        return Test.run ();*/
+        return 0;
+    }
+}

=== added file 'src/Tests/Utils.vala'
--- src/Tests/Utils.vala	1970-01-01 00:00:00 +0000
+++ src/Tests/Utils.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,101 @@
+using Cable.Utils;
+
+namespace Cable.Tests.Utils {
+
+    const string[] urls = {
+        "http://www.google.com",
+        "http://www.valadoc.org/#!api=libgee-0.8/Gee.HashSet",
+        "https://encrypted.google.com/#bav=on.2,or.r_qf.&fp=9ff24d502d1bb08f&q=%C4%91%C5%82%C5%82%7D%5D%C5%A7%E2%86%93%C2%B3%C2%BC%7D%E2%86%93%C2%B2%C4%91&safe=off",
+        "www.bob.com",
+        "mailto:[e-mail]",
+        "[e-mail]"
+    };
+    
+    const string[] non_urls = {
+        "bob",
+        "bob.com"
+    };
+
+    public void test_markup () {
+        foreach (var url in urls)
+            assert (parse_string_to_markup (url) != url);
+        
+        foreach (var non_url in non_urls)
+            assert (parse_string_to_markup (non_url) == non_url);
+    }
+    
+    const string[] networks = {
+        "irc.freenode.net:Freenode:",
+        "irc.gimp.org:GimpNet:",
+        "irc.fu-berlin.de:IRCnet:",
+        "irc.quakenet.org:QuakeNet:",
+        "irc.efnet.nl:EFnet:",
+        "undernet.org:Undernet:",
+        "irc.rizon.net:Rizon:",
+        "c.ustream.tv:Ustream:"
+    };
+    
+    public void test_networks () {
+        Cable.Settings.init ();
+        
+        var settings = Cable.Settings.preferences.networks;
+        Cable.Settings.preferences.networks = networks;
+        
+        Network.init ();
+        assert (Network.all.size == networks.length);
+    
+        var network1 = new Network ("irc.test.net");
+        assert (network1.address == "irc.test.net");
+        assert (network1.name != null);
+        assert (network1.password == "");
+        assert (Network.all.size == networks.length + 1);
+        
+        assert (Network.search ("irc.test.net") != null);
+        assert (Network.search ("irc.test2.net") == null);
+        
+        var network2 = Network.get_or_create ("irc.test2.net");
+        assert (network2.address == "irc.test2.net");
+        assert (network2.name != null);
+        assert (network2.password == "");
+        assert (Network.all.size == networks.length + 2);
+        
+        var network3 = Network.get_or_create ("irc.test2.net");
+        assert (network2 == network3);
+        
+        Cable.Settings.preferences.networks = settings;
+    }
+    
+    const string[] identities = {
+        "nick|name:Real Name:bye bye!"
+    };
+    
+    public void test_identities () {
+        Cable.Settings.init ();
+        
+        var settings = Cable.Settings.preferences.identities;
+        Cable.Settings.preferences.identities = identities;
+        
+        Identity.init ();
+        assert (Identity.all.size == identities.length);
+    
+        var identity1 = new Identity ("newnick");
+        assert (identity1.nick_name == "newnick");
+        assert (identity1.real_name != null);
+        assert (identity1.part_message != null);
+        assert (Identity.all.size == identities.length + 1);
+        
+        assert (Identity.search ("newnick") != null);
+        assert (Identity.search ("newnick2") == null);
+        
+        var identity2 = Identity.get_or_create ("newnick2");
+        assert (identity2.nick_name == "newnick2");
+        assert (identity2.real_name != null);
+        assert (identity2.part_message != null);
+        assert (Identity.all.size == identities.length + 2);
+        
+        var identity3 = Identity.get_or_create ("newnick2");
+        assert (identity2 == identity3);
+        
+        Cable.Settings.preferences.identities = settings;
+    }
+}

=== added directory 'src/Utils'
=== removed file 'src/Utils.vala'
--- src/Utils.vala	2013-06-28 19:07:25 +0000
+++ src/Utils.vala	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/***
-    Copyright (C) 2013 Cable Developers
-
-    This program or library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 3 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
- 
-    You should have received a copy of the GNU Lesser General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301 USA.
-***/
-
-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");
-    }
-}

=== added file 'src/Utils/AutoScrolled.vala'
--- src/Utils/AutoScrolled.vala	1970-01-01 00:00:00 +0000
+++ src/Utils/AutoScrolled.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,44 @@
+/***
+    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.Utils.AutoScrolled : Gtk.ScrolledWindow {
+
+    public bool autoscroll { get; set; default = true; }
+
+    public AutoScrolled () {
+        setup_autoscroll ();
+    }
+
+    void setup_autoscroll () {
+        var do_scroll = true;
+        var adj = get_vadjustment ();
+
+        get_vadjustment ().changed.connect (() => {
+            var do_scroll_old = do_scroll;
+            do_scroll = adj.value + adj.page_size == adj.upper;
+
+            if (do_scroll_old)
+                adj.set_value (adj.upper);
+        });
+
+        get_vadjustment ().value_changed.connect (() => {
+            do_scroll = adj.value + adj.page_size == adj.upper;
+        });
+    }
+}

=== added file 'src/Utils/EmbeddedAlert.vala'
--- src/Utils/EmbeddedAlert.vala	1970-01-01 00:00:00 +0000
+++ src/Utils/EmbeddedAlert.vala	2013-08-11 12:01:40 +0000
@@ -0,0 +1,424 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2012 Granite Developers (http://launchpad.net/granite)
+ *
+ * This 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 2 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Victor Eduardo <[e-mail]>
+ */
+
+public class Granite.Widgets.EmbeddedAlert : Gtk.EventBox {
+
+    private const int MARGIN = 78;
+    private const int MAX_WIDTH = 850;
+
+    private const string PRIMARY_TEXT_MARKUP = "<span weight=\"bold\" size=\"larger\">%s</span>";
+
+    private int image_size {
+        get {
+            return image.pixel_size;
+        }
+        set {
+            return_if_fail (value > 0 && image != null && spinner != null);
+            image.pixel_size = value;
+            image_box.set_size_request (value + 2, value);
+            int spinner_size = value - 10;
+            spinner_size = (spinner_size > 0) ? spinner_size : value;
+            spinner.set_size_request (spinner_size, spinner_size);
+            image_box.queue_resize ();
+        }
+    }
+
+    bool queued_icon_visibility = false;
+    public bool show_icon {
+        get {
+            return queued_icon_visibility;
+        }
+        set {
+            queued_icon_visibility = value;
+
+            if (!working)
+                set_image_box_visible (queued_icon_visibility);
+        }
+    }
+
+    public bool working {
+        get {
+            return spinner.active;
+        }
+        set {
+            return_if_fail (image_box != null && image != null && spinner != null);
+
+            var child = image_box.get_child ();
+            if (child != null)
+                image_box.remove (child);
+
+            image_box.add ((value) ? spinner as Gtk.Widget : image as Gtk.Widget);
+            set_image_box_visible (show_icon || value);
+            spinner.active = value;
+        }
+    }
+
+
+    /**
+     * Message header.
+     * The string *should not* contain any markup information, since the text will be escaped.
+     */
+    public string primary_text {
+        get {
+            return primary_text_label.label;
+        }
+        set {
+            set_widget_visible (primary_text_label, value.strip() != "");
+            primary_text_label.set_markup (Markup.printf_escaped (PRIMARY_TEXT_MARKUP, value));
+        }
+    }
+
+    /**
+     * Message body.
+     * You can include markup information along with the message.
+     */
+    public string secondary_text {
+        get {
+            return secondary_text_label.label;
+        }
+        set {
+            set_widget_visible (secondary_text_label, value.strip() != "");
+            secondary_text_label.set_markup (value);
+        }
+    }
+
+    private Gtk.MessageType _message_type = Gtk.MessageType.QUESTION;
+
+    /**
+     * Warning level of the message.
+     * Besides defining what icon to use, it also defines whether the primary and secondary
+     * text are selectable or not.
+     * The text is selectable for the WARNING, ERROR and QUESTION types.
+     */
+    public Gtk.MessageType message_type {
+        get {
+            return _message_type;
+        }
+        set {
+            _message_type = value;
+            image.set_from_icon_name (get_icon_name_for_message_type (value), Gtk.IconSize.DIALOG);
+
+            // Make sure the text is selectable if the level is WARNING, ERROR or QUESTION
+            bool text_selectable = value == Gtk.MessageType.WARNING ||
+                                   value == Gtk.MessageType.ERROR ||
+                                   value == Gtk.MessageType.QUESTION;
+            primary_text_label.selectable = secondary_text_label.selectable = text_selectable;
+        }
+    }
+
+    private Gtk.Action[] ? _actions = null;
+
+    /**
+     * All these actions are mapped to buttons
+     */
+    public Gtk.Action[] ? actions {
+        get {
+            return _actions;
+        }
+        set {
+            _actions = value;
+
+            // clear button box
+            foreach (var button in action_button_box.get_children ()) {
+                action_button_box.remove (button);
+            }
+
+            // Add a button for each action
+            if (actions != null) {
+                for (int i = 0; i < actions.length; i++) {
+                    var action_item = actions[i];
+                    if (action_item != null) {
+                        var action_button = new_button_from_action (action_item);
+                        action_button_box.pack_start (action_button, false, false, 0);
+                    }
+                }
+
+                buttons_visible = true;
+            }
+            else {
+                buttons_visible = false;
+            }
+        }
+    }
+
+    public bool buttons_visible {
+        get { return action_button_box.visible; }
+        set { set_widget_visible (action_button_box, value); }
+    }
+
+    private Gtk.Grid content_grid;
+    private Gtk.Image image;
+    private Gtk.Spinner spinner;
+    private Gtk.EventBox image_box;
+    private Gtk.Label primary_text_label;
+    private Gtk.Label secondary_text_label;
+    private Gtk.ButtonBox action_button_box;
+
+    public EmbeddedAlert () {
+        var style = this.get_style_context ();
+        style.add_class (Gtk.STYLE_CLASS_VIEW);
+        style.add_class (Granite.StyleClass.CONTENT_VIEW);
+
+        this.primary_text_label = new Gtk.Label (null);
+        this.secondary_text_label = new Gtk.Label (null);
+
+        this.primary_text_label.wrap = secondary_text_label.wrap = true;
+        this.primary_text_label.use_markup = secondary_text_label.use_markup = true;
+
+        this.action_button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+
+        this.image_box = new Gtk.EventBox ();
+        this.image_box.visible_window = false;
+        this.image_box.above_child = true;
+        this.image_box.halign = Gtk.Align.END;
+        this.image_box.valign = Gtk.Align.START;
+        this.image_box.margin_right = 12;
+
+        this.image = new Gtk.Image ();
+        this.spinner = new Gtk.Spinner ();
+
+        this.spinner.halign = Gtk.Align.CENTER;
+        this.spinner.valign = Gtk.Align.CENTER;
+
+        this.primary_text_label.margin_bottom = 12;
+        this.secondary_text_label.margin_bottom = 18;
+        this.primary_text_label.valign = secondary_text_label.valign = Gtk.Align.START;
+        this.primary_text_label.vexpand = secondary_text_label.vexpand = false;
+
+        this.action_button_box.valign = Gtk.Align.START;
+        this.action_button_box.vexpand = false;
+        this.action_button_box.spacing = 6;
+
+        this.content_grid = new Gtk.Grid ();
+
+        this.content_grid.attach (this.image_box, 1, 1, 1, 3);
+        this.content_grid.attach (this.primary_text_label, 2, 1, 1, 1);
+        this.content_grid.attach_next_to (this.secondary_text_label, this.primary_text_label,
+                                          Gtk.PositionType.BOTTOM, 1, 1);
+        this.content_grid.attach_next_to (this.action_button_box, this.secondary_text_label,
+                                          Gtk.PositionType.BOTTOM, 1, 1);
+
+        content_grid.halign = content_grid.valign = Gtk.Align.CENTER;
+        content_grid.margin = MARGIN;
+
+        // Use a fixedbin widget so that we're always in control of the size
+        var size_wrapper = new FixedBin (-1, -1, MAX_WIDTH, -1);
+        size_wrapper.set_widget (content_grid);
+
+        this.add (size_wrapper);
+
+        // INIT WIDGETS. We use these setters to avoid code duplication
+        this.image_size = 64;
+        this.working = false;
+        this.set_alert ("", "", null, false);
+    }
+
+    /** PUBLIC API **/
+
+    /**
+     * Convenient method that allows setting all the widget properties at once, instead of making
+     * single calls to set_primary_text(), set_secondary_text(), show_icon, etc. These are called
+     * for you internally. Using this method is recommended when you plan to destroy the widget
+     * after the user makes a choice, or if you want to re-use the alert to display completely
+     * different information, which is often the case.
+     */
+    public void set_alert (string primary_text, string secondary_text, Gtk.Action[] ? actions = null,
+                            bool show_icon = true, Gtk.MessageType type = Gtk.MessageType.WARNING)
+    {
+        // Reset size request
+        set_size_request (0, 0);
+
+        this.primary_text = primary_text;
+        this.secondary_text = secondary_text;
+        this.actions = actions;
+        this.message_type = type;
+
+        this.show_icon = show_icon;
+    }
+
+    /* INTERNALS */
+
+    private void set_image_box_visible (bool visible) {
+        set_widget_visible (image_box, visible);
+        update_text_layout (visible);
+    }
+
+    private void update_text_layout (bool show_icon) {
+        // Whenever show_icon is true, the title has to be left-aligned. This also
+        // applies to the spinner
+        if (show_icon) {
+            primary_text_label.halign = secondary_text_label.halign = Gtk.Align.START;
+            primary_text_label.justify = Gtk.Justification.LEFT;
+            secondary_text_label.justify = Gtk.Justification.FILL;
+
+            action_button_box.set_layout (Gtk.ButtonBoxStyle.END);
+            action_button_box.halign = Gtk.Align.END;
+        }
+        else {
+            primary_text_label.halign = secondary_text_label.halign = Gtk.Align.CENTER;