Merge branch 'master' into winbuffers

This commit is contained in:
James Booth
2014-07-29 15:52:14 +01:00

View File

@@ -252,8 +252,12 @@ prefs_get_priority(void)
gint gint
prefs_get_reconnect(void) prefs_get_reconnect(void)
{ {
if (!g_key_file_has_key(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL)) {
return 30;
} else {
return g_key_file_get_integer(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL); return g_key_file_get_integer(prefs, PREF_GROUP_CONNECTION, "reconnect", NULL);
} }
}
void void
prefs_set_reconnect(gint value) prefs_set_reconnect(gint value)