Simplify connection code.

connect.go

@@ -25,22 +25,16 @@ func connect(options xmpp.Options, directTLS bool) (*xmpp.Client, error) {
 					// Use StartTLS
 					options.NoTLS = true
 					options.StartTLS = true
-					options.Host = net.JoinHostPort(adr.Target, fmt.Sprint(adr.Port))
-					// Connect to server
-					client, err := options.NewClient()
-					if err == nil {
-						return client, nil
-					}
 				} else if adr.Type == "xmpps-client" {
 					// Use direct TLS
 					options.NoTLS = false
 					options.StartTLS = false
-					options.Host = net.JoinHostPort(adr.Target, fmt.Sprint(adr.Port))
-					// Connect to server
-					client, err := options.NewClient()
-					if err == nil {
-						return client, nil
-					}
+				}
+				options.Host = net.JoinHostPort(adr.Target, fmt.Sprint(adr.Port))
+				// Connect to server
+				client, err := options.NewClient()
+				if err == nil {
+					return client, nil
 				}
 			}
 		}