3 files changed, 8 insertions, 3 deletions

diff --git a/vchat-config.h b/vchat-config.h
index d494736..e2bbc40 100755
--- a/vchat-config.h
+++ b/vchat-config.h
@@ -32,7 +32,7 @@ static volatile configoption configoptions[] = {
   {CF_NICK,        CO_STR, "nick",       NULL,                   NULL,       { .pstr = &nick }   },
   {CF_FROM,        CO_STR, "from",       "vc-alpha-0.16",        NULL,       { NULL }  },
   {CF_SERVERHOST,  CO_STR, "host",       "pulse.flatline.de",    NULL,       { NULL }  },
-  {CF_SERVERPORT,  CO_STR, "port",       "2325",                 NULL,       { NULL }   },
+  {CF_SERVERPORT,  CO_STR, "port",       "2325",                 NULL,       { NULL }  },
   {CF_CIPHERSUITE, CO_STR, "ciphers",    "HIGH:MEDIUM",          NULL,       { NULL }  },
   {CF_CONFIGFILE,  CO_STR, "conffile",   "~/.vchat/config",      NULL,       { NULL }  },
   {CF_CERTFILE,    CO_STR, "certfile",   "~/.vchat/cert",        NULL,       { NULL }  },
@@ -45,6 +45,7 @@ static volatile configoption configoptions[] = {
   {CF_USETIME,     CO_INT, "usetime",    (char *) 1,             (char *)-1, { .pint = &usetime } },
   {CF_USETOPIC,    CO_INT, "usetopicbar",(char *) 1,             (char *)-1, { NULL }  },
   {CF_PRIVHEIGHT,  CO_INT, "messages",   (char *) 0,             (char *)-1, { NULL }  },
+  {CF_PRIVCOLLAPS, CO_INT, "privcollaps",(char *) 0,             (char *)-1, { NULL }  },
   {CF_HSCROLL,     CO_INT, "hscroll",    (char *) 5,             (char *)-1, { .pint = &hscroll } },
   {CF_CHANNEL,     CO_INT, "channel",    (char *) 0,             (char *)-1, { NULL }  },
   {CF_SCROLLBPRIV, CO_INT, "privscrollb",(char *) 2048,          (char *)-1, { NULL }  },
diff --git a/vchat-ui.c b/vchat-ui.c
index 6742656..544644d 100755
--- a/vchat-ui.c
+++ b/vchat-ui.c
@@ -788,7 +788,7 @@ resize (int signal)
   if( topic )
       wresize(topic,1,screensx);
 
-  /* public channel is always their and its height depends on:
+  /* public channel is always there and its height depends on:
      * existence and visibility of priv window
      * existence of a topic line (oldschool vchat style)
   */
@@ -1211,6 +1211,10 @@ initui (void)
   rl_callback_handler_install ("", (rl_vcpfunc_t *) linecomplete);
 #endif
 
+
+  if( getintoption(CF_PRIVCOLLAPS) )
+    toggleprivwin();
+
 /*
   writeout( ">> Ctrl-X <<");
 
diff --git a/vchat.h b/vchat.h
index 5293482..fbc9a2e 100755
--- a/vchat.h
+++ b/vchat.h
@@ -37,7 +37,7 @@ typedef struct servermessage servermessage;
 typedef enum { CO_NIL, CO_STR, CO_INT } conftype;
 typedef enum { CF_NIL, CF_NICK, CF_FROM, CF_SERVERHOST, CF_SERVERPORT,
 CF_CIPHERSUITE, CF_CONFIGFILE, CF_CERTFILE, CF_KEYFILE, CF_FORMFILE, CF_LOGINSCRIPT,
-CF_USESSL, CF_USECERT, CF_PRIVHEIGHT, CF_HSCROLL, CF_CHANNEL, CF_USETIME,
+CF_USESSL, CF_USECERT, CF_PRIVHEIGHT, CF_PRIVCOLLAPS, CF_HSCROLL, CF_CHANNEL, CF_USETIME,
 CF_USETOPIC, CF_SCROLLBPRIV, CF_SCROLLBACK, CF_SCROLLBPRIVT, CF_SCROLLBACKT,
 CF_ENCODING, CF_BELLPRIV } confopt;