Fix more errors

Author: dar5hak

plugins/backend/feedbin/feedbinAPI.vala

@@ -68,24 +68,22 @@ public class FeedbinAPI : Object {
 		    message.set_request_body_from_bytes (null, new Bytes (input.data));
 		}
 
-		m_session.send_and_read(message);
-		var status = message.status_code;
-		if(status < 200 || status >= 400)
-		{
-			switch(status)
-			{
-				case Soup.Status.CANT_RESOLVE:
-				case Soup.Status.CANT_RESOLVE_PROXY:
-				case Soup.Status.CANT_CONNECT:
-				case Soup.Status.CANT_CONNECT_PROXY:
-				throw new FeedbinError.NO_CONNECTION(@"Connection to $m_base_uri failed");
-				case Soup.Status.UNAUTHORIZED:
-				throw new FeedbinError.NOT_AUTHORIZED(@"Not authorized to $method $path");
-				case Soup.Status.NOT_FOUND:
-				throw new FeedbinError.NOT_FOUND(@"$method $path not found");
-			}
-			string phrase = Soup.Status.get_phrase(status);
-			throw new FeedbinError.UNKNOWN_ERROR(@"Unexpected status $status ($phrase) for $method $path");
+        try {
+		    m_session.send_and_read(message);
+		    var status = message.status_code;
+		    if (status < 200 || status >= 400) {
+			    switch (status)
+			    {
+				    case Soup.Status.UNAUTHORIZED:
+				    throw new FeedbinError.NOT_AUTHORIZED(@"Not authorized to $method $path");
+				    case Soup.Status.NOT_FOUND:
+				    throw new FeedbinError.NOT_FOUND(@"$method $path not found");
+			    }
+			    string phrase = Soup.Status.get_phrase(status);
+			    throw new FeedbinError.UNKNOWN_ERROR(@"Unexpected status $status ($phrase) for $method $path");
+		    }
+		} catch (Error e) {
+		    throw new FeedbinError.NO_CONNECTION (@"Connection to $m_base_uri failed");
 		}
 		return message;
 	}
@@ -128,7 +126,7 @@ public class FeedbinAPI : Object {
 	private static Json.Node parse_json(Soup.Message response) throws FeedbinError
 	{
 		var method = response.method;
-		var uri = response.uri.to_string(false);
+		var uri = response.uri.to_string ();
 		string content = (string)response.response_body.flatten().data;
 		if(content == null)
 		{
@@ -142,7 +140,7 @@ public class FeedbinAPI : Object {
 		}
 		catch (Error e)
 		{
-			throw new FeedbinError.INVALID_FORMAT(@"$method $uri returned invalid JSON: " + e.message + "\nContent is: $content");
+			throw new FeedbinError.INVALID_FORMAT (@"$method $uri returned invalid JSON: $(e.message)\nContent is: $content");
 		}
 		return parser.get_root();
 	}