Changeset be999a5 for storage.c

Timestamp:

2010-08-23T23:12:24Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad2d8bc

Parents:

237eadd (diff), eb6df6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:

• storage.c (modified) (6 diffs)

storage.c

@@ -28 +28 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+#include "otr.h"
 
 extern storage_t storage_text;
@@ -114 +115 @@
 
                 status = st->load(irc, password);
-                if (status == STORAGE_OK)
+                if (status == STORAGE_OK) {
+                        otr_load(irc);
                         return status;
-                
+                }
                 if (status != STORAGE_NO_SUCH_USER) 
                         return status;
@@ -137 +139 @@
                 return STORAGE_NO_SUCH_USER;
         }
-        
+
+        otr_save(irc);
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
         
@@ -163 +166 @@
                         ret = status;
         }
+        if (ret == STORAGE_OK) {
+                otr_remove(nick);
+        }
         
         return ret;
@@ -176 +182 @@
         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. 
@@ -205 +213 @@
 
         storage_remove(onick, password);
+        otr_rename(onick, nnick);
 
         return STORAGE_OK;