* be a bit more thorough with nulls

[citadel.git] / webcit / preferences.c

diff --git a/webcit/preferences.c b/webcit/preferences.c
index 174e0e33e0c107411d551699491408c0186db68b..bc263d4e72a709d412539c2f7bdccc25e8fec5f0 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -160,8 +160,8 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
                }
 
                if ((ChrPtr(ReadBuf)[0] == ' ') &&
-                   (Data != NULL)) {
-                       StrBufAppendBuf(Data->Val, ReadBuf, 1);
+                   (LastData != NULL)) {
+                       StrBufAppendBuf(LastData->Val, ReadBuf, 1);
                }
                else {
                        LastData = Data = malloc(sizeof(Preference));
@@ -185,6 +185,7 @@ void ParsePref(HashList **List, StrBuf *ReadBuf)
                                DestroyPreference(Data);
                                LastData = NULL;
                        }
+                       Data = NULL;
                }
        }
        GetPrefTypes(*List);
@@ -201,7 +202,7 @@ void load_preferences(void)
        StrBuf *ReadBuf;
        long msgnum = 0L;
        
-       ReadBuf = NewStrBuf();
+       ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
        if (goto_config_room(ReadBuf) != 0) {
                FreeStrBuf(&ReadBuf);
                return; /* oh well. */
@@ -293,7 +294,7 @@ void WritePrefsToServer(HashList *Hash)
                        int n = 0;
                        size_t offset, nchars;
                        if (SubBuf == NULL)
-                               SubBuf = NewStrBuf();
+                               SubBuf = NewStrBufPlain(NULL, SIZ);
                        nchars = 1;
                        offset = 0;
                        while (nchars > 0) {
@@ -989,6 +990,8 @@ ServerStartModule_PREFERENCES
        PreferenceHooks = NewHash(1, NULL);
 }
 
+
+
 void 
 ServerShutdownModule_PREFERENCES
 (void)
@@ -996,6 +999,15 @@ ServerShutdownModule_PREFERENCES
        DeleteHash(&PreferenceHooks);
 }
 
+void
+SessionDetachModule__PREFERENCES
+(wcsession *sess)
+{
+       if (sess->SavePrefsToServer) {
+               save_preferences();
+               sess->SavePrefsToServer = 0;
+       }
+}
 
 void
 SessionNewModule_PREFERENCES