summaryrefslogtreecommitdiff
path: root/src/trg-client.c
diff options
context:
space:
mode:
authorGravatar Alan Fitton <ajf@eth0.org.uk>2011-09-16 18:12:40 +0000
committerGravatar Alan Fitton <ajf@eth0.org.uk>2011-09-16 18:12:40 +0000
commit17f7587fe8c34034d1cc1d22c7d8be15ef03afb3 (patch)
treea29647845b182a4efce71ac7ccf96b90e0255cf1 /src/trg-client.c
parent1d03f2cb43dfafbf42b6beb1f7d0335a9448afbd (diff)
fix potential config mutex deadlock
Diffstat (limited to 'src/trg-client.c')
-rw-r--r--src/trg-client.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/trg-client.c b/src/trg-client.c
index 55ae74e..f83b0e4 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -61,7 +61,7 @@ struct _TrgClientPrivate {
gint64 updateSerial;
JsonObject *session;
gboolean ssl;
- float version;
+ //float version;
char *url;
char *username;
char *password;
@@ -145,11 +145,11 @@ trg_client_new (void)
return tc;
}
-float trg_client_get_version(TrgClient *tc)
+/*float trg_client_get_version(TrgClient *tc)
{
TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);
return priv->version;
-}
+}*/
gint64 trg_client_get_rpc_version(TrgClient *tc)
{
@@ -164,7 +164,7 @@ void trg_client_set_session(TrgClient * tc, JsonObject * session)
if (priv->session)
json_object_unref(priv->session);
- session_get_version(session, &priv->version);
+ //session_get_version(session, &priv->version);
priv->session = session;
@@ -204,9 +204,11 @@ int trg_client_populate_with_settings(TrgClient * tc)
host = trg_prefs_get_string(prefs, TRG_PREFS_KEY_HOSTNAME, TRG_PREFS_PROFILE);
if (!host) {
+ g_mutex_unlock(priv->configMutex);
return TRG_NO_HOSTNAME_SET;
} else if (strlen(host) < 1) {
g_free(host);
+ g_mutex_unlock(priv->configMutex);
return TRG_NO_HOSTNAME_SET;
}