Merge lp:~voldyman/cable/white-space into lp:cable

[Akshay Shekher]

=== modified file 'src/Widgets/Server.vala'
--- src/Widgets/Server.vala	2013-05-25 19:58:46 +0000
+++ src/Widgets/Server.vala	2013-05-25 20:15:31 +0000
@@ -1,135 +1,136 @@
 
-namespace Cable.Widgets
-{
-	public class Server : Granite.Widgets.SourceList.ExpandableItem
-	{
-		//some default servers
-		public static const string [] DEFAULT_SERVERS = {
-			"Freenode", " irc.freenode.net",
-			"GimpNET", "irc.gimp.org"
-		};
-
-		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;
-
-			doodleIRC.User user = doodleIRC.User () {
-				realname = settings.real_name,
-				hostname = settings.nick,
-				username = settings.nick,
-				servername = uri
-			};
-			server = new doodleIRC.DoodleIRCServer ("irc.freenode.net", user, settings.nick);
-			Global.get_default ().user_nick = settings.nick; //TODO use fallback nicks
-
-			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) {
-						(room as Room).message (sender.split ("!")[0], msg);
-						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);
+    namespace Cable.Widgets
+    {
+    public class Server : Granite.Widgets.SourceList.ExpandableItem
+    {
+        //some default servers
+        public static const string [] DEFAULT_SERVERS = {
+            "Freenode", " irc.freenode.net",
+            "GimpNET", "irc.gimp.org"
+        };
+
+        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;
+
+            doodleIRC.User user = doodleIRC.User () {
+                realname = settings.real_name,
+                hostname = settings.nick,
+                username = settings.nick,
+                servername = uri
+            };
+            server = new doodleIRC.DoodleIRCServer ("irc.freenode.net", user, settings.nick);
+            Global.get_default ().user_nick = settings.nick; //TODO use fallback nicks
+
+            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) {
+                        (room as Room).message (sender, msg);
+                        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);
             server.get_topic (channel, (channel, topic) => {
-            room.label.set_label(topic);
-        });
-
-			app.servers.selected = room;
-		}
-
-		//builds up a ComboBox offering some default and your custom servers
+                print ("Topic :&s\n".printf (topic));
+                room.label.set_label (topic);
+            });
+
+            app.servers.selected = room;
+        }
+
+        //builds up a ComboBox offering some default and your custom servers
         /*modified by Xylon*/
-		public static Gtk.ComboBoxText get_server_list ()
-		{
-			var box = new Gtk.ComboBoxText.with_entry ();
-
-			//add the default ones
-			for (var i = 0; i < DEFAULT_SERVERS.length; i += 2) {
-				box.append (DEFAULT_SERVERS[i + 1], DEFAULT_SERVERS[i]);
-			}
-
-			//add the custom ones
-			foreach (var server in Settings.get_default ().servers) {
-				if (server == "")
-					continue;
-
-				var details = server.split (":");
-				box.append (details[1], details[0]);
-			}
-
-			box.active = 0;
-
-			return box;
-		}
-
-		public static Gtk.Dialog get_add_dialog ()
-		{
-			var dialog = new Gtk.Dialog.with_buttons (_("Add Server"), null, Gtk.DialogFlags.MODAL);
-			var grid = new Gtk.Grid ();
-			var 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;
-		}
-	}
+        public static Gtk.ComboBoxText get_server_list ()
+        {
+            var box = new Gtk.ComboBoxText.with_entry ();
+
+            //add the default ones
+            for (var i = 0; i < DEFAULT_SERVERS.length; i += 2) {
+                box.append (DEFAULT_SERVERS[i + 1], DEFAULT_SERVERS[i]);
+            }
+
+            //add the custom ones
+            foreach (var server in Settings.get_default ().servers) {
+                if (server == "")
+                    continue;
+
+                var details = server.split (":");
+                box.append (details[1], details[0]);
+            }
+
+            box.active = 0;
+
+            return box;
+        }
+
+        public static Gtk.Dialog get_add_dialog ()
+        {
+            var dialog = new Gtk.Dialog.with_buttons (_("Add Server"), null, Gtk.DialogFlags.MODAL);
+            var grid = new Gtk.Grid ();
+            var 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;
+        }
+    }
 }