summaryrefslogtreecommitdiff
path: root/src/trg-client.c
diff options
context:
space:
mode:
authorGravatar Alan Fitton <ajf@eth0.org.uk>2011-10-19 20:21:19 +0000
committerGravatar Alan Fitton <ajf@eth0.org.uk>2011-10-19 20:21:19 +0000
commit3fa2dbf607db03b7f2535d7eb98ee6bdae0239dd (patch)
treec134603b54c23cd2dfc2a14650d8d39394dfd139 /src/trg-client.c
parenta04430bff79030690add518548677251816e3e71 (diff)
implement a TRG_PREFS_CONNECTION flag which gets prefs for the connected profile
Diffstat (limited to 'src/trg-client.c')
-rw-r--r--src/trg-client.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/trg-client.c b/src/trg-client.c
index 481156c..617a0e1 100644
--- a/src/trg-client.c
+++ b/src/trg-client.c
@@ -60,7 +60,6 @@ struct _TrgClientPrivate {
guint min_interval;
gint64 updateSerial;
JsonObject *session;
- JsonObject *currentProfile;
gboolean ssl;
float version;
char *url;
@@ -197,12 +196,6 @@ TrgPrefs *trg_client_get_prefs(TrgClient *tc)
return priv->prefs;
}
-JsonObject *trg_client_get_current_profile(TrgClient *tc)
-{
- TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);
- return priv->currentProfile;
-}
-
int trg_client_populate_with_settings(TrgClient * tc)
{
TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);
@@ -216,6 +209,8 @@ int trg_client_populate_with_settings(TrgClient * tc)
g_mutex_lock(priv->configMutex);
+ trg_prefs_set_connection(prefs, trg_prefs_get_profile(prefs));
+
g_free(priv->url);
priv->url = NULL;
@@ -269,8 +264,6 @@ int trg_client_populate_with_settings(TrgClient * tc)
trg_prefs_get_bool(prefs,
TRG_PREFS_KEY_UPDATE_ACTIVE_ONLY, TRG_PREFS_PROFILE);
- priv->currentProfile = trg_prefs_get_profile(prefs);
-
#ifdef HAVE_LIBPROXY
if ((pf = px_proxy_factory_new())) {
char **proxies = px_proxy_factory_get_proxies(pf, priv->url);
@@ -342,7 +335,8 @@ void trg_client_status_change(TrgClient *tc, gboolean connected)
json_object_unref(priv->session);
priv->session = NULL;
}
- priv->currentProfile = NULL;
+
+ trg_prefs_set_connection(priv->prefs, NULL);
}
}
@@ -352,16 +346,6 @@ JsonObject* trg_client_get_session(TrgClient *tc)
return priv->session;
}
-void trg_client_del_profile(TrgClient *tc, JsonObject *profile)
-{
- TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);
-
- if (profile == priv->currentProfile)
- priv->currentProfile = NULL;
-
- trg_prefs_del_profile(priv->prefs, profile);
-}
-
void trg_client_thread_pool_push(TrgClient *tc, gpointer data, GError **err)
{
TrgClientPrivate *priv = TRG_CLIENT_GET_PRIVATE(tc);