Move savedata to options struct.

Add a way to select the type of savedata (normal savedata, load a
secret key, potentially others?) to load.

4 files changed, 15 insertions, 5 deletions

diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index 2d326c4b..a4e2254a 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -222,7 +222,7 @@ Tox *init_tox(int argc, char *argv[])
         exit(0);
     }
 
-    Tox *tox = tox_new(0, 0, 0, 0);
+    Tox *tox = tox_new(0, 0);
 
     if (!tox)
         exit(1);
diff --git a/testing/nTox.c b/testing/nTox.c
index 77f812b5..03f17da5 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -942,7 +942,17 @@ static Tox *load_data()
             return 0;
         }
 
-        Tox *m = tox_new(0, data, size, NULL);
+        struct Tox_Options options;
+
+        tox_options_default(&options);
+
+        options.savedata_type = TOX_SAVEDATA_TYPE_TOX_SAVE;
+
+        options.savedata_data = data;
+
+        options.savedata_length = size;
+
+        Tox *m = tox_new(&options, NULL);
 
         if (fclose(data_file) < 0) {
             perror("[!] fclose failed");
@@ -953,7 +963,7 @@ static Tox *load_data()
         return m;
     }
 
-    return tox_new(0, 0, 0, NULL);
+    return tox_new(NULL, NULL);
 }
 
 static int save_data(Tox *m)
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index 23fa320a..521e9f36 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
         printf("error setting flags\n");
     }
 
-    Tox *tox = tox_new(0, 0, 0, 0);
+    Tox *tox = tox_new(0, 0);
     tox_callback_friend_connection_status(tox, print_online, NULL);
     tox_callback_friend_message(tox, print_message, master);
 
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index be1fe32d..738c2f2d 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
-    Tox *tox = tox_new(0, 0, 0, 0);
+    Tox *tox = tox_new(0, 0);
     tox_callback_file_recv_chunk(tox, write_file, NULL);
     tox_callback_file_recv_control(tox, file_print_control, NULL);
     tox_callback_file_recv(tox, file_request_accept, NULL);