Merge lp:~ebanyash/cable/cable-e into lp:cable

[Evan Banyash]

I changed the installation instructions to be more correct, brought in voldyman's functional backend and credited him for it.

This is important because as of now, the project's trunk is non-functional. It crashes upon trying to join a channel.

[Akshay Shekher (voldyman)]

nice work.
please change the permissions of the files to -x from +x.

review: Needs Fixing

[Evan Banyash (ebanyash)]

And... done.

This is how you use the "Resubmit" review type, right?

review: Needs Resubmitting

[Evan Banyash (ebanyash)]

> And... done.
>
> This is how you use the "Resubmit" review type, right?

...No, apparently it is not.
Sorry, I'm a bit GNU here.

review: Approve

[Akshay Shekher (voldyman)]

my mistake, i meant remove the executable attribute (make all fines -x)

and your last commit is empty.

review: Needs Fixing

[lp:~ebanyash/cable/cable-e]

11. By Evan Banyash on 2013-05-16

small update to root cmakelists

12. By Evan Banyash on 2013-05-16

Okay, -x on everything now

13. By Evan Banyash on 2013-05-16

merging to avoid conflicting branches, apparently

[Evan Banyash (ebanyash)]

> my mistake, i meant remove the executable attribute (make all fines -x)
>
> and your last commit is empty.

Yeah, I guess it was empty because everything was already +x. I thought that was normal when just changing permissions. I guess not. Okay, it should all be -x now except the directories because apparently you can't really use them without the execute bit.

[Akshay Shekher (voldyman)]

for the backend, could you get the latest one from github.com/voldyman/doodleIRC ?

that would be the ultimate merge :)

[Evan Banyash (ebanyash)]

> for the backend, could you get the latest one from
> github.com/voldyman/doodleIRC ?
>
> that would be the ultimate merge :)

Good idea. I'll see what I can do.

Hopefully nothing will break too bad.

[Evan Banyash (ebanyash)]

Hmm... do you suggest that I keep doodleIRC.vala intact and change the server widget? Then we'd have two namespaces in the project. Is that okay? Or should I change the namespace of doodleIRC.vala to be in Cable?

[Akshay Shekher (voldyman)]

You could keep it intact so the frontend and back end will be separate and
easier to update later.
On May 16, 2013 7:20 PM, "Evan Banyash" <email address hidden> wrote:

> Hmm... do you suggest that I keep doodleIRC.vala intact and change the
> server widget? Then we'd have two namespaces in the project. Is that okay?
> Or should I change the namespace of doodleIRC.vala to be in Cable?
> --
> https://code.launchpad.net/~ebanyash/cable/cable-e/+merge/163713
> You are reviewing the proposed merge of lp:~ebanyash/cable/cable-e into
> lp:cable.
>

[lp:~ebanyash/cable/cable-e]

14. By Evan Banyash on 2013-05-16

Moved to latest DoodleIRC backend

15. By Evan Banyash on 2013-05-16

Deleted the old Backend.vala

[Evan Banyash (ebanyash)]

And, done. Everything appears to still work, too!

review: Approve

[lp:~ebanyash/cable/cable-e]

16. By Evan Banyash on 2013-05-17

okay, I forgot to add this last time. Whew, crisis over

17. By Evan Banyash on 2013-05-17

added a script to build and test at super fast speeds

[Akshay Shekher (voldyman)]

very good work.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-05-17 01:15:34 +0000
@@ -0,0 +1,2 @@
+build
+*~
\ No newline at end of file

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-10-25 19:43:33 +0000
+++ CMakeLists.txt	2013-05-17 01:15:34 +0000
@@ -1,6 +1,6 @@
 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
 
-project (agenda)
+project (cable)
 cmake_minimum_required (VERSION 2.8)
 cmake_policy (VERSION 2.6)
 
@@ -41,7 +41,7 @@
 
 include(ValaPrecompile)
 vala_precompile(VALA_C
-    src/Backend.vala
+    src/doodleIRC.vala
     src/Cable.vala
     src/Global.vala
     src/Settings.vala
@@ -52,6 +52,7 @@
 PACKAGES
     granite
 OPTIONS
+    --target-glib=2.32
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/
     )
 
@@ -64,4 +65,4 @@
 
 install(TARGETS cable RUNTIME DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/cable.desktop DESTINATION share/applications)
-#install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/agenda.svg DESTINATION share/icons/hicolor/48x48/apps)
+#install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/cable.svg DESTINATION share/icons/hicolor/48x48/apps) And this is where I'd put my icon... IF I HAD ONE

=== modified file 'INSTALL'
--- INSTALL	2012-08-22 15:00:43 +0000
+++ INSTALL	2013-05-17 01:15:34 +0000
@@ -9,10 +9,10 @@
     gdk-x11-3.0
 
 Installation:
-    bzr branch lp:eidete
-    cd eidete
+    bzr branch lp:cable
+    cd cable
     mkdir build
     cd build
-    cmake .. -DCMAKE_INSTALL_PREFIX
+    cmake ..
     make
     sudo make install

=== added directory 'bin'
=== added file 'bin/quickbuild.sh'
--- bin/quickbuild.sh	1970-01-01 00:00:00 +0000
+++ bin/quickbuild.sh	2013-05-17 01:15:34 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+#
+mkdir ../build;
+cd ../build;
+rm -rf *;
+cmake ..;
+make;
+cd ../bin;
+ln ../build/cable cable;
+./cable
\ No newline at end of file

=== removed file 'src/Backend.vala'
--- src/Backend.vala	2012-10-25 19:43:33 +0000
+++ src/Backend.vala	1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-
-namespace Cable.Backend {
-
-    public class Server {
-        public List<string> chans;
-        string nick;
-        string server_url;
-        User user;
-        SocketConnection connection;
-        unowned Thread<int> thread;
-        bool connected;
-        List<string> to_send;
-
-        public Server (string url, User user, string nick) {
-            this.server_url = url;
-            this.user = user;
-            this.nick = nick;
-
-            this.chans = new List<string> ();
-            connected = false;
-            to_send = new List<string> ();
-
-            on_connect_complete.connect (() =>{
-                to_send.foreach ((cmd) => {
-                    print ("Sending "+cmd);
-                    raw_send (cmd);
-                    to_send.remove (cmd);
-                });
-
-            });
-        }
-
-        ~DoodleIRCServer () {
-            quit_server ("Client Quit");
-            Thread.exit (1);
-
-        }
-
-        public void change_nick (string chan, string nick) {
-            this.nick = nick;
-            raw_send ("NICK %s\r\n".printf (this.nick));
-        }
-
-        public void connect () {
-            if (!connected) {
-                try {
-                    thread = Thread.create<int> (this.loop, false);
-                } catch (Error e) {
-                    error ("Could Not Start Thread: %s".printf (e.message));
-                }
-            }
-        }
-
-
-        public int loop () {
-
-            try {
-                // Resolve hostname to IP address
-                var resolver = Resolver.get_default ();
-                var addresses = resolver.lookup_by_name (this.server_url, null);
-                var address = addresses.nth_data (0);
-                print ("Resolved %s to %s\n".printf (this.server_url, address.to_string ()));
-
-                // Connect
-                var client = new SocketClient ();
-                connection = client.connect (new InetSocketAddress (address, 6667));
-                print ("Connected to %s\n".printf (this.server_url));
-
-                // Send USER request
-                var message = "USER %s %s %s :%s\r\n".printf (user.username, user.hostname,
-                                                            user.servername, user.realname);
-                raw_send (message);
-                print ("Wrote request USER\n");
-
-                // Send NICK request
-                message = "NICK %s\r\n".printf (nick);
-                raw_send (message);
-                print ("Wrote nick request\n");
-
-                var response = new DataInputStream (connection.input_stream);
-
-                on_connect_complete ();
-                connected = true;
-                // Receive response
-                string line="", msg="", sender="" , chan="" , cmd="" ;
-                while (true) {
-                    line = response.read_line (null).strip ();
-                    if (line[0] == ':')
-                        parse_line (line, out sender,out  cmd, out chan, out msg);
-                    else {
-                        cmd = line.split (" ")[0].strip ();
-                    }
-                    switch (cmd) {
-                        case "PING":
-                            print ("pinged\n");
-                            raw_send (line.replace("PING","PONG"));
-                            break;
-                        case "NOTICE":
-                            print ("Noice: "+msg.strip ()+"\n");
-                            on_notice (msg.strip ());
-                            break;
-                        case "PRIVMSG":
-                            print ("Chan-> "+chan+"\nMSG-> "+msg+"\n");
-                            on_message (sender, chan, msg);
-                            break;
-
-                        case "QUIT":
-                            print (" %s has quit\n".printf (sender));
-                            break;
-
-                        case "JOIN":
-                            print ("User has Joined");
-                            on_user_join (chan, nick);
-                            break;
-
-                        case "433": // nick name is use
-                            change_nick (chan,this.nick+"_");
-                            rejoin_channels ();
-                            break;
-                        case "353":
-                            on_names_listed (msg.split (" "));
-                            break;
-                        default:
-                            print (line+"\n\n\n");
-                            break;
-                    }
-
-                }
-            } catch (Error e) {
-                stderr.printf ("%s\n", e.message);
-            }
-            return 0;
-        }
-
-        private void raw_send (string line) {
-            try {
-                connection.output_stream.write (line.data);
-                connection.output_stream.flush ();
-            } catch (Error e) {
-                error ("raw_send: %s".printf (e.message));
-            }
-        }
-
-        void parse_line (string line, out string sender,out string cmd, out string chan, out string msg) {
-            //split the message from the info
-            var first_split = line.split (":");
-            var info = first_split[1];
-            //msg = join_str_ar (2, first_split.length, first_split);
-            msg = line.split (" :")[1];
-
-            //split the info to extract sender and chan
-            var second_split = info.split (" ");
-            cmd = second_split[1].strip ();
-            chan = second_split[2].strip ();
-            sender = second_split[0].strip ();
-        }
-
-        private void process_message () {
-
-        }
-
-        public void send (string cmd) {
-            if (connected)
-                raw_send (cmd);
-            else
-                to_send.append (cmd);
-        }
-        private void rejoin_channels () {
-            // Send JOIN request
-            foreach (string chan in chans) {
-                join_chan (chan);
-                print ("Wrote request to join %s\n".printf (chan));
-            }
-        }
-        public void kick_user (string chan, string user, string reason) {
-            send ("KICK %s %s :%s\r\n".printf (chan, user, reason));
-        }
-
-        public void join_chan (string chan) {
-            send ("JOIN %s\r\n".printf (chan));
-            chans.append (chan);
-        }
-
-        public void quit_server (string message) {
-            send ("QUIT :%s\r\n".printf (message));
-        }
-
-        public void exit_chan (string chan) {
-            send ("PART %s\r\n".printf (chan));
-        }
-
-        public void write (string chan, string msg) {
-            send ("PRIVMSG %s :%s\r\n".printf (chan, msg));
-        }
-
-        public void get_names (string chan) {
-            send ("NAMES %s\r\n".printf(chan));
-        }
-
-        //public void
-        public signal void on_connect_complete ();
-        public signal void on_message (string sender, string chan, string msg);
-        public signal void on_notice (string notice);
-        public signal void on_error (string error_msg);
-        public signal void on_user_join (string chan, string nick);
-        public signal void on_names_listed (string[] names);
-    }
-
-    public struct User {
-        public string username;
-        public string hostname;
-        public string servername;
-        public string realname;
-    }
-}

=== modified file 'src/Cable.vala'
--- src/Cable.vala	2012-10-25 19:43:33 +0000
+++ src/Cable.vala	2013-05-17 01:15:34 +0000
@@ -7,39 +7,39 @@
 		{
 			program_name = "Cable";
 			exec_name = "cable";
-			
+
 			build_data_dir = Constants.DATADIR;
 			build_pkg_data_dir = Constants.PKGDATADIR;
 			build_release_name = Constants.RELEASE_NAME;
 			build_version = Constants.VERSION;
 			build_version_info = Constants.VERSION_INFO;
-			
+
 			app_years = "2012";
 			app_icon = "applications-chat";
 			app_launcher = "cable.desktop";
 			application_id = "net.launchpad.cable";
-			
+
 			main_url = "https://code.launchpad.net/cable";
 			bug_url = "https://bugs.launchpad.net/cable";
 			help_url = "https://code.launchpad.net/cable";
 			translate_url = "https://translations.launchpad.net/cable";
-			
-			about_authors = {"Tom Beckmann <[e-mail]>"};
+
+			about_authors = {"Tom Beckmann <[e-mail]>", "Akshay Shekher <[e-mail]"};
 			about_documenters = {"Tom Beckmann <[e-mail]>"};
 			about_artists = {"Harvey Cabaguio"};
 			about_comments = "Development release, not all features implemented";
 			about_translators = "";
 			about_license_type = Gtk.License.GPL_3_0;
 		}
-		
+
 		Gtk.Window window;
 		public Granite.Widgets.SourceList servers;
 		public Gtk.EventBox display_box;
-		
+
 		public App ()
 		{
 		}
-		
+
 		void build ()
 		{
 			window = new Gtk.Window ();
@@ -49,33 +49,33 @@
 			servers = new Granite.Widgets.SourceList ();
 			var menu = new Gtk.Menu ();
 			display_box = new Gtk.EventBox ();
-			
+
 			var join_channel = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("internet-web-browser", Gtk.IconSize.LARGE_TOOLBAR), _("Join a Channel"));
 			var add_server = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("tab-new", Gtk.IconSize.LARGE_TOOLBAR), _("Add a Server"));
 			var edit_user = new Gtk.MenuItem.with_label (_("Edit User Settings"));
-			
+
 			var welcome = new Granite.Widgets.Welcome (_("Welcome to Cable"), _("Connect to the IRC world"));
 			welcome.append ("internet-web-browser", _("Channel"), _("Join a Channel"));
 			welcome.append ("tab-new", _("Server"), _("Add a Custom Server"));
-			
+
 			var exp = new Gtk.ToolItem ();
 			exp.set_expand (true);
-			
+
 			menu.append (edit_user);
-			
+
 			toolbar.insert (join_channel, -1);
 			toolbar.insert (add_server, -1);
 			toolbar.insert (exp, -1);
 			toolbar.insert (create_appmenu (menu), -1);
-			
+
 			main.pack_start (toolbar, false);
 			main.pack_start (paned);
-			
+
 			paned.pack1 (servers, false, true);
 			paned.pack2 (display_box, true, true);
-			
+
 			display_box.add (welcome);
-			
+
 			window.set_application (this);
 			window.title = "Cable";
 			window.icon_name = "applications-chat";
@@ -83,9 +83,9 @@
 			window.window_position = Gtk.WindowPosition.CENTER;
 			window.add (main);
 			window.show_all ();
-			
+
 			window.show_all ();
-			
+
 			welcome.activated.connect ((index) => {
 				if (index == 0) {
 					var dialog = get_join_dialog ();
@@ -124,10 +124,10 @@
 					display_box.show_all ();
 				}
 			});
-			
+
 			/*initial setup*/
 			var settings = Cable.Settings.get_default ();
-			
+
 			//configuration incomplete
 			if (settings.real_name == "" || settings.nick == "") {
 				var settings_dialog = new Widgets.SettingsDialog ();
@@ -135,57 +135,57 @@
 				settings_dialog.show_all ();
 				settings_dialog.run ();
 			}
-			
+
 			//we got something to do
 			if (settings.favorites.length > 0) {
-				
+
 			}
 		}
-		
+
 		public Gtk.Dialog get_join_dialog ()
 		{
 			var dialog = new Gtk.Dialog ();
 			dialog.modal = true;
-			
+
 			var box = new Gtk.Grid ();
 			box.margin = 12;
 			box.column_spacing = 6;
 			box.row_spacing = 6;
-			
+
 			var entry = new Gtk.Entry ();
 			entry.secondary_icon_name = "edit-redo-symbolic";
-			
+
 			var list = Widgets.Server.get_server_list ();
-			
+
 			box.attach (new Gtk.Label (_("Server")), 0, 0, 1, 1);
 			box.attach (list, 1, 0, 1, 1);
 			box.attach (new Gtk.Label (_("Join Channel") + " #"), 0, 1, 1, 1);
 			box.attach (entry, 1, 1, 1, 1);
 			box.margin = 6;
-			
+
 			entry.icon_release.connect (() => entry.activate ());
 			entry.activate.connect (() => {
 				foreach (var server in servers.root.children) {
 					if (server is Widgets.Server && (server as Widgets.Server).uri == list.active_id) {
 						(server as Widgets.Server).join_channel ("#"+entry.text);
-						
+
 						dialog.destroy ();
 						return;
 					}
 				}
-				
+
 				servers.root.add (new Widgets.Server (this, list.get_active_text (), list.active_id, "#"+entry.text));
 				dialog.destroy ();
 			});
-			
+
 			(dialog.get_content_area () as Gtk.Container).add (box);
 			dialog.title = _("Join Channel");
-			
+
 			entry.grab_focus ();
-			
+
 			return dialog;
 		}
-		
+
 		public override void activate ()
 		{
 			build ();
@@ -196,8 +196,8 @@
 public static int main (string [] args)
 {
 	Gtk.init (ref args);
-	
+
 	var cable = new Cable.App ();
-	
+
 	return cable.run (args);
 }

=== modified file 'src/Global.vala'
--- src/Global.vala	2012-08-22 15:00:43 +0000
+++ src/Global.vala	2013-05-17 01:15:34 +0000
@@ -5,18 +5,18 @@
 		get;
 		set;
 	}
-	
+
 	Global ()
 	{
-		
+
 	}
-	
+
 	static Global? instance;
 	public static Global get_default ()
 	{
 		if (instance == null)
 			instance = new Global ();
-		
+
 		return instance;
 	}
 }

=== modified file 'src/Widgets/Room.vala'
--- src/Widgets/Room.vala	2012-10-25 19:43:33 +0000
+++ src/Widgets/Room.vala	2013-05-17 01:15:34 +0000
@@ -7,31 +7,31 @@
 		VOICED,
 		REGULAR
 	}
-	
+
 	public enum MessageType
 	{
 		NORMAL,
 		ENTER,
 		LEAVE
 	}
-	
+
 	public class Room : Granite.Widgets.SourceList.Item
 	{
 		Granite.Widgets.SourceList.ExpandableItem operators;
 		Granite.Widgets.SourceList.ExpandableItem voiced;
 		Granite.Widgets.SourceList.ExpandableItem regular;
-		
+
 		Granite.Widgets.SourceList users;
 		Gtk.TreeView chat;
 		Gtk.ScrolledWindow left_scrolled;
 		public Gtk.Box room;
-		
+
 		public signal void send_message (string message);
-		
+
 		public Room (string channel)
 		{
 			name = channel;
-			
+
 			room = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
 			var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
 			var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
@@ -45,18 +45,18 @@
 			left_scrolled = new Gtk.ScrolledWindow (null, null);
 			var right_scrolled = new Gtk.ScrolledWindow (null, null);
 			var user = new Gtk.Label ("<span color='#999'>"+Global.get_default ().user_nick+"</span>");
-			
+
 			var left = new Gtk.CellRendererText ();
 			left.xalign = 1.0f;
 			left.width = 90;
 			left.font_desc = Pango.FontDescription.from_string (
 				new GLib.Settings ("org.gnome.desktop.interface").get_string ("monospace-font-name"));
-			
+
 			var right = new Gtk.CellRendererText ();
 			right.wrap_mode = Pango.WrapMode.WORD_CHAR;
 			right.wrap_width = -1;
 			right.font_desc = left.font_desc;
-		
+
 			chat.enable_grid_lines = Gtk.TreeViewGridLines.VERTICAL;
 			chat.headers_visible = false;
 			chat.insert_column_with_attributes (-1, null, left, "markup", 0);
@@ -69,23 +69,23 @@
 				}", -1);
 			} catch (Error e) { warning (e.message); }
 			chat.get_style_context ().add_provider (css, 40000);
-		
+
 			label.halign = Gtk.Align.START;
-		
+
 			topic_item.add (label);
 			topic_item.set_expand (true);
 			topic.insert (topic_item, -1);
 			topic.get_style_context ().add_class ("seconday-toolbar");
-		
+
 			operators = new Granite.Widgets.SourceList.ExpandableItem (_("Operators"));
 			voiced = new Granite.Widgets.SourceList.ExpandableItem ("Voiced");
 			regular = new Granite.Widgets.SourceList.ExpandableItem ("Regular");
 			users.root.add (operators);
 			users.root.add (voiced);
 			users.root.add (regular);
-		
+
 			paned.get_style_context ().add_class ("sidebar-pane-separator");
-		
+
 			css = new Gtk.CssProvider ();
 			try {
 				css.load_from_data ("*{
@@ -93,18 +93,18 @@
 				}", -1);
 			} catch (Error e) { warning (e.message); }
 			users.get_style_context ().add_provider (css, 40000);
-		
+
 			users.hscrollbar_policy = Gtk.PolicyType.NEVER;
 			users.width_request = 150;
-		
+
 			paned.pack1 (box, true, false);
 			paned.pack2 (right_scrolled, false, false);
-		
+
 			user.width_request = 99;
 			user.margin_right = 5;
 			user.xalign = 1.0f;
 			user.use_markup = true;
-			
+
 			css = new Gtk.CssProvider ();
 			try {
 				css.load_from_data ("*{
@@ -120,24 +120,24 @@
 				}", -1);
 			} catch (Error e) { warning (e.message); }
 			entry.get_style_context ().add_provider (css, 40000);
-			
+
 			bottom.pack_start (user, false);
 			bottom.pack_start (entry);
-			
+
 			left_scrolled.add (chat);
-			
+
 			box.pack_start (left_scrolled);
 			box.pack_start (bottom, false);
-			
+
 			room.pack_start (topic, false);
 			room.pack_start (paned);
-			
+
 			entry.activate.connect (() => {
 				send_message (entry.text);
-				message ("tom95", entry.text);
+				message (Global.get_default ().user_nick, entry.text);
 				entry.text = "";
 			});
-			
+
 			bottom.draw.connect ((cr) => {
 				var grad = new Cairo.Pattern.linear (0, 0, 0, bottom.get_allocated_height () - 4);
 				grad.add_color_stop_rgb (0.0, 0.9, 0.9, 0.9);
@@ -145,18 +145,18 @@
 				cr.rectangle (0, 0, bottom.get_allocated_width (), bottom.get_allocated_height ());
 				cr.set_source (grad);
 				cr.fill ();
-			
+
 				cr.move_to (0, 0);
 				cr.line_to (room.get_allocated_width (), 0);
 				cr.close_path ();
 				cr.set_source_rgba (0.1, 0.1, 0.1, 1.0);
 				cr.set_line_width (1);
 				cr.stroke ();
-				
+
 				return false;
 			});
 		}
-	
+
 		public void add_user (string name, UserType type)
 		{
 			if (type == UserType.OPERATOR)
@@ -165,10 +165,10 @@
 				voiced.add (new Granite.Widgets.SourceList.Item (name));
 			else
 				regular.add (new Granite.Widgets.SourceList.Item (name));
-		
+
 			message (name, "", MessageType.ENTER);
 		}
-	
+
 		public void remove_user (string name)
 		{
 			Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
@@ -176,36 +176,36 @@
 				foreach (var child in list.children) {
 					if (child.name == name) {
 						list.remove (child);
-					
+
 						message (child.name, "", MessageType.LEAVE);
-					
+
 						return;
 					}
-				
+
 					return;
 				}
 			}
 		}
-	
+
 		public void message (owned string from, string message, MessageType type=MessageType.NORMAL)
 		{
 			bool do_scroll = left_scrolled.vadjustment.value + 10 > left_scrolled.vadjustment.upper;
-			
+
 			Gtk.TreeIter iter;
 			(chat.model as Gtk.ListStore).append (out iter);
-			
+
 			if (type == MessageType.NORMAL) {
-			
+
 				if (from == Global.get_default ().user_nick)
 					from = "<span color='#999'>"+from+"</span>";
 				else if (message.index_of (Global.get_default ().user_nick) != -1)
 					from = "<span color='#a00'>"+from+"</span>";
-			
+
 				(chat.model as Gtk.ListStore).set (iter, 0, from, 1, message);
 			} else
-				(chat.model as Gtk.ListStore).set (iter, 0, "", 
+				(chat.model as Gtk.ListStore).set (iter, 0, "",
 					1, "<span color='#999'>%s has %s the room.</span>".printf (from, type == MessageType.ENTER ? "entered" : "left"));
-			
+
 			Timeout.add (10, () => {
 			if (do_scroll)
 				left_scrolled.vadjustment.value = left_scrolled.vadjustment.upper;

=== modified file 'src/Widgets/Server.vala'
--- src/Widgets/Server.vala	2012-10-25 19:48:49 +0000
+++ src/Widgets/Server.vala	2013-05-17 01:15:34 +0000
@@ -8,29 +8,34 @@
 			"Freenode", " irc.freenode.net",
 			"GimpNET", "irc.gimp.org"
 		};
-		
-		Backend.Server server;
+
+		doodleIRC.DoodleIRCServer server;
 		App app;
-		
+
 		public string uri;
-		
+
 		public Server (App _app, string _name, string _uri, string? channel = null)
 		{
 			var settings = Settings.get_default ();
 			name = _name;
 			app = _app;
 			uri = _uri;
-			
-			Backend.User user = Backend.User () {
+
+			doodleIRC.User user = doodleIRC.User () {
 				realname = settings.real_name,
 				hostname = settings.nick,
 				username = settings.nick,
 				servername = uri
 			};
-			server = new Backend.Server ("irc.freenode.net", user, settings.nick);
+			server = new doodleIRC.DoodleIRCServer ("irc.freenode.net", user, settings.nick);
 			Global.get_default ().user_nick = settings.nick; //TODO use fallback nicks
-			
-			server.connect ();
+
+			try {
+				server.connect ();
+			} catch (Error e) {
+			//Needs Fixing
+				Gtk.main_quit ();
+			}
 			server.on_message.connect ((sender, chan, msg) => {
 				foreach (var room in children) {
 					if ((room as Room).name == chan) {
@@ -38,50 +43,50 @@
 						return;
 					}
 				}
-				
+
 				critical ("Channel '%s' has not been opened", chan);
-			}); 
-			
+			});
+
 			if (channel != null)
 				join_channel (channel);
 		}
-		
+
 		public void join_channel (string channel)
 		{
 			var room = new Room (channel);
 			add (room);
 			expand_all ();
-			
+
 			room.send_message.connect ((msg) => server.write (room.name, msg));
 			server.join_chan (channel);
-			
+
 			app.servers.selected = room;
 		}
-		
+
 		//builds up a ComboBox offering some default and your custom servers
 		public static Gtk.ComboBoxText get_server_list ()
 		{
 			var box = new Gtk.ComboBoxText ();
-			
+
 			//add the default ones
 			for (var i = 0; i < DEFAULT_SERVERS.length; i += 2) {
 				box.append (DEFAULT_SERVERS[i + 1], DEFAULT_SERVERS[i]);
 			}
-			
+
 			//add the custom ones
 			foreach (var server in Settings.get_default ().servers) {
 				if (server == "")
 					continue;
-				
+
 				var details = server.split (":");
 				box.append (details[1], details[0]);
 			}
-			
+
 			box.active = 0;
-			
+
 			return box;
 		}
-		
+
 		public static Gtk.Dialog get_add_dialog ()
 		{
 			var dialog = new Gtk.Dialog.with_buttons (_("Add Server"), null, Gtk.DialogFlags.MODAL);
@@ -89,39 +94,38 @@
 			var name = new Gtk.Entry ();
 			var url = new Gtk.Entry ();
 			var add = new Gtk.Button.with_label (_("Add Server"));
-			
+
 			name.placeholder_text = "Server";
 			url.placeholder_text = "irc.server.net";
-			
 			grid.margin = 12;
 			grid.column_spacing = 6;
 			grid.row_spacing = 6;
-			
+
 			grid.attach (new Gtk.Label (_("Server Name:")), 0, 0, 1, 1);
 			grid.attach (name, 1, 0, 1, 1);
 			grid.attach (new Gtk.Label (_("Server URL:")), 0, 1, 1, 1);
 			grid.attach (url, 1, 1, 1, 1);
 			grid.attach (add, 1, 2, 1, 1);
-			
+
 			url.activate.connect (() => add.clicked ());
-			
+
 			add.clicked.connect (() => {
 				var servers = Settings.get_default ().servers;
 				servers.resize (servers.length + 1);
 				servers[servers.length - 1] = name.text + ":" + url.text;
 				Settings.get_default ().servers = servers;
-				
+
 				dialog.destroy ();
 			});
-			
+
 			name.changed.connect (() => add.sensitive = name.text != "" && url.text != "");
 			url.changed.connect  (() => add.sensitive = name.text != "" && url.text != "");
-			
+
 			add.sensitive = false;
-			
+
 			(dialog.get_content_area () as Gtk.Container).add (grid);
-			
+
 			return dialog;
 		}
 	}
-}
+}
\ No newline at end of file

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