diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/trg-client.c | 12 | ||||
| -rw-r--r-- | src/trg-main-window.c | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/trg-client.c b/src/trg-client.c index a952347..c7e9e36 100644 --- a/src/trg-client.c +++ b/src/trg-client.c @@ -274,7 +274,8 @@ int trg_client_populate_with_settings(TrgClient * tc) int i; for (i = 0; proxies[i]; i++) { - if (g_str_has_prefix(proxies[i], HTTP_URI_PREFIX)) { + if (g_str_has_prefix(proxies[i], HTTP_URI_PREFIX) + || g_str_has_prefix(proxies[i], HTTPS_URI_PREFIX)) { g_free(priv->proxy); priv->proxy = proxies[i]; } else { @@ -294,20 +295,17 @@ int trg_client_populate_with_settings(TrgClient * tc) gchar *trg_client_get_password(TrgClient * tc) { - TrgClientPrivate *priv = tc->priv; - return priv->password; + return tc->priv->password; } gchar *trg_client_get_username(TrgClient * tc) { - TrgClientPrivate *priv = tc->priv; - return priv->username; + return tc->priv->username; } gchar *trg_client_get_url(TrgClient * tc) { - TrgClientPrivate *priv = tc->priv; - return priv->url; + return tc->priv->url; } gchar *trg_client_get_session_id(TrgClient * tc) diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 672965e..01e0436 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1040,7 +1040,7 @@ static gboolean on_session_get(gpointer data) if (!isConnected) { gdouble version; - if (trg_dialog_error_handler(win, response) == TRUE) { + if (trg_dialog_error_handler(win, response)) { trg_response_free(response); reset_connect_args(win); return FALSE; |