Merged Irssi SVN (upcoming irssi 0.8.11).

[silc.git] / apps / irssi / src / fe-common / core / fe-queries.c

diff --git a/apps/irssi/src/fe-common/core/fe-queries.c b/apps/irssi/src/fe-common/core/fe-queries.c
index 8345d52f06b79adcd8f4bd7edd158e2249e83b5a..f1763814103ea11576770e23172623ab19df8872 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-queries.c
+++ b/apps/irssi/src/fe-common/core/fe-queries.c
@@ -322,7 +322,7 @@ static int sig_query_autoclose(void)
                    now-rec->last_unread_msg > query_auto_close)
                        query_destroy(rec);
        }
-        return 1;
+     return 1;
 }
 
 static void sig_message_private(SERVER_REC *server, const char *msg,
@@ -340,8 +340,8 @@ static void sig_message_private(SERVER_REC *server, const char *msg,
 
 static void read_settings(void)
 {
-       querycreate_level = level2bits(settings_get_str("autocreate_query_level"));
-       query_auto_close = settings_get_int("autoclose_query");
+       querycreate_level = settings_get_level("autocreate_query_level");
+       query_auto_close = settings_get_time("autoclose_query")/1000;
        if (query_auto_close > 0 && queryclose_tag == -1)
                queryclose_tag = g_timeout_add(5000, (GSourceFunc) sig_query_autoclose, NULL);
        else if (query_auto_close <= 0 && queryclose_tag != -1) {
@@ -352,9 +352,9 @@ static void read_settings(void)
 
 void fe_queries_init(void)
 {
-       settings_add_str("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS");
+       settings_add_level("lookandfeel", "autocreate_query_level", "MSGS DCCMSGS");
        settings_add_bool("lookandfeel", "autocreate_own_query", TRUE);
-       settings_add_int("lookandfeel", "autoclose_query", 0);
+       settings_add_time("lookandfeel", "autoclose_query", "0");
 
        queryclose_tag = -1;
        read_settings();