Merge lp:~santi698/gazette/fix-long-text into lp:gazette

[Santiago Ocamica]

Ellipsizes long strings.

=== modified file 'src/Services/Files.vala'
--- src/Services/Files.vala	2013-04-22 19:06:09 +0000
+++ src/Services/Files.vala	2013-04-25 04:04:27 +0000
@@ -44,7 +44,7 @@
 	    files_list.reactive = false;
 		var res = "<span font='12' face='Open Sans'>";
 		for (var i = 0; i < 10 && i < last_files.length (); i++) {
-			res += last_files.nth_data (i).get_display_name () + "\n";
+			res += ellipsize (last_files.nth_data (i).get_display_name (), 40) + "\n";
 		}
 		files_list.label = res + "</span>";
 		files_list.reactive = true;

=== modified file 'src/Services/News.vala'
--- src/Services/News.vala	2013-04-22 19:06:09 +0000
+++ src/Services/News.vala	2013-04-25 04:04:27 +0000
@@ -76,7 +76,7 @@
 			    var title = output.substring (offset, output.index_of ("</title>", offset) - offset);
 			    offset = output.index_of ("<link>", offset) + 6;
 			    var url = output.substring (offset, output.index_of ("</link>", offset) - offset);
-			    news[i] = {title, url};
+			    news[i] = {ellipsize(title, 40), url};
 		    }
 		    var list = "<span font='12' face='Open Sans'>";
 		    for (var i = 0; i < news.length; i++) {

=== modified file 'src/Services/Service.vala'
--- src/Services/Service.vala	2013-04-22 19:06:09 +0000
+++ src/Services/Service.vala	2013-04-25 04:04:27 +0000
@@ -124,4 +124,12 @@
 	{
 		animate (Clutter.AnimationMode.LINEAR, 400, opacity : 255);
 	}
+	
+	public static string ellipsize (string s, int max_length) {
+	    string ret = s;
+	    if (ret.length > max_length)
+	        ret = ret.substring (0, ret.index_of_nth_char(max_length-3)) + "...";
+	    debug(ret);
+	    return ret;
+	}
 }