Changes in storage.c [3183c21:823de9d]

File:

• storage.c (modified) (6 diffs)

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "crypting.h"
+#include "otr.h"
 
 extern storage_t storage_text;
@@ -116 +117 @@
 
                 status = st->load(irc, password);
-                if (status == STORAGE_OK)
+                if (status == STORAGE_OK) {
+                        otr_load(irc);
                         return status;
+                }
                 
                 if (status != STORAGE_NO_SUCH_USER) 
@@ -139 +142 @@
                 return STORAGE_NO_SUCH_USER;
         }
-        
+
+        otr_save(irc);
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
         
@@ -165 +169 @@
                         ret = status;
         }
+        if (ret == STORAGE_OK) {
+                otr_remove(nick);
+        }
         
         return ret;
@@ -178 +185 @@
         storage_t *primary_storage = gl->data;
         irc_t *irc;
-
+        
         /* First, try to rename in the current write backend, assuming onick 
          * is stored there */
         status = primary_storage->rename(onick, nnick, password);
-        if (status != STORAGE_NO_SUCH_USER)
+        if (status != STORAGE_NO_SUCH_USER) {
+                otr_rename(onick, nnick);
                 return status;
+        }
 
         /* Try to load from a migration backend and save to the current backend. 
@@ -207 +216 @@
 
         storage_remove(onick, password);
+        otr_rename(onick, nnick);
 
         return STORAGE_OK;