diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-10-19 20:52:57 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-10-19 20:52:57 +0000 |
| commit | 3b8fd9e7274477cfad98d66e41a43417ce8d21bf (patch) | |
| tree | 0d9aab6c0ea8eea5cc3daff03bda75162a0c842d /src/trg-prefs.c | |
| parent | 3fa2dbf607db03b7f2535d7eb98ee6bdae0239dd (diff) | |
use previous change to remove some unnecessary code and so intervals are taken from the current connection, not selected profile
Diffstat (limited to 'src/trg-prefs.c')
| -rw-r--r-- | src/trg-prefs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trg-prefs.c b/src/trg-prefs.c index 90d8887..a9ee946 100644 --- a/src/trg-prefs.c +++ b/src/trg-prefs.c @@ -92,7 +92,7 @@ static void trg_prefs_create_defaults(TrgPrefs *p) { _(TRG_PROFILE_NAME_DEFAULT)); trg_prefs_add_default_int(p, TRG_PREFS_KEY_PORT, 9091); trg_prefs_add_default_int(p, TRG_PREFS_KEY_UPDATE_INTERVAL, TRG_INTERVAL_DEFAULT); - trg_prefs_add_default_int(p, TRG_PREFS_KEY_MINUPDATE_INTERVAL, TRG_MININTERVAL_DEFAULT); + trg_prefs_add_default_int(p, TRG_PREFS_KEY_MINUPDATE_INTERVAL, TRG_INTERVAL_DEFAULT); trg_prefs_add_default_int(p, TRG_PREFS_ACTIVEONLY_FULLSYNC_EVERY, 2); trg_prefs_add_default_int(p, TRG_PREFS_KEY_STATES_PANED_POS, 120); @@ -213,10 +213,10 @@ JsonNode *trg_prefs_get_value(TrgPrefs *p, gchar *key, int type, int flags) { TrgPrefsPrivate *priv = GET_PRIVATE(p); JsonNode *res; - if ((flags & TRG_PREFS_PROFILE)) { - if ((res = trg_prefs_get_value_inner(trg_prefs_get_profile(p), key, type, flags))) + if (priv->profile && (flags & TRG_PREFS_PROFILE)) { + if ((res = trg_prefs_get_value_inner(priv->profile, key, type, flags))) return res; - } else if ((flags & TRG_PREFS_CONNECTION)) { + } else if (priv->connectionObj && (flags & TRG_PREFS_CONNECTION)) { if ((res = trg_prefs_get_value_inner(priv->connectionObj, key, type, flags))) return res; } else { |