Changeset 764c7d1 for storage.c

Timestamp:

2008-02-03T21:30:03Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

3c80a9d

Parents:

b5c8a34

Message:

OTR support, first checkin

File:

• storage.c (modified) (6 diffs)

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "crypting.h"
+#include "otr.h"
 
 extern storage_t storage_text;
@@ -115 +116 @@
                 if (status == STORAGE_OK) {
                         irc_setpass(irc, password);
+                        otr_load(irc);          /* load our OTR userstate */
                         return status;
                 }
                 
-                if (status != STORAGE_NO_SUCH_USER) 
+                if (status != STORAGE_NO_SUCH_USER) {
                         return status;
+                }
         }
         
@@ -127 +130 @@
 storage_status_t storage_save (irc_t *irc, int overwrite)
 {
-        return ((storage_t *)global.storage->data)->save(irc, overwrite);
+        storage_status_t st;
+        
+        otr_save(irc);
+        st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+        return st;
 }
 
@@ -147 +154 @@
                         ret = status;
         }
+        if (ret == STORAGE_OK) {
+                otr_remove(nick);
+        }
         
         return ret;
@@ -157 +167 @@
         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. 
@@ -186 +198 @@
 
         storage_remove(onick, password);
+        otr_rename(onick, nnick);
 
         return STORAGE_OK;