Changeset 0c85c08 for storage.c

Timestamp:

2010-08-31T23:18:21Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

934db064

Parents:

f5c0d8e

Message:

Pluginify this thing a little bit. Not so much in the dynamically loadable
sense of the word, more in a way that core files don't have to include otr.h.

File:

• storage.c (modified) (6 diffs)

storage.c

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