emdee
/
tox-weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed data loading/saving.

This commit is contained in:
Håvard Pettersson 2014-09-20 23:36:40 +02:00
parent 06e7747142
commit 9b39ef3953
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tox-weechat-data.c
View File

@ -17,6 +17,11 @@
* along with Tox-WeeChat. If not, see <http://www.gnu.org/licenses/>. * along with Tox-WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/ */
/////// TODO //////////
// get rid of data from deleted/nonexisting identities so it doesn't accumulate
///////////////////////
#include <weechat/weechat-plugin.h> #include <weechat/weechat-plugin.h>
#include <tox/tox.h> #include <tox/tox.h>
#include <jansson.h> #include <jansson.h>

1
src/tox-weechat-friend-requests.c
View File

@ -27,7 +27,6 @@
#include "tox-weechat.h" #include "tox-weechat.h"
#include "tox-weechat-identities.h" #include "tox-weechat-identities.h"
#include "tox-weechat-utils.h" #include "tox-weechat-utils.h"
#include "tox-weechat-json.h"
#include "tox-weechat-friend-requests.h" #include "tox-weechat-friend-requests.h"

8
src/tox-weechat-identities.c
View File

@ -262,8 +262,8 @@ tox_weechat_identity_connect(struct t_tox_weechat_identity *identity)
(uint8_t *)name, strlen(name)); (uint8_t *)name, strlen(name));
} }
// load JSON data // load data
tox_weechat_json_identity_load(identity); tox_weechat_data_identity_load(identity);
// bootstrap DHT // bootstrap DHT
int max_bootstrap_nodes = 5; int max_bootstrap_nodes = 5;
@ -292,8 +292,8 @@ tox_weechat_identity_disconnect(struct t_tox_weechat_identity *identity)
if (!identity->tox) if (!identity->tox)
return; return;
// save JSON data // save data
tox_weechat_json_identity_save(identity); tox_weechat_data_identity_save(identity);
// save and kill tox // save and kill tox
int result = tox_weechat_save_identity_data_file(identity); int result = tox_weechat_save_identity_data_file(identity);

4
src/tox-weechat.c
View File

@ -48,7 +48,7 @@ weechat_plugin_init(struct t_weechat_plugin *plugin, int argc, char *argv[])
tox_weechat_config_init(); tox_weechat_config_init();
tox_weechat_config_read(); tox_weechat_config_read();
tox_weechat_json_load(); tox_weechat_data_load();
tox_weechat_commands_init(); tox_weechat_commands_init();
tox_weechat_gui_init(); tox_weechat_gui_init();
tox_weechat_completion_init(); tox_weechat_completion_init();
@ -62,7 +62,7 @@ int
weechat_plugin_end(struct t_weechat_plugin *plugin) weechat_plugin_end(struct t_weechat_plugin *plugin)
{ {
tox_weechat_config_write(); tox_weechat_config_write();
tox_weechat_json_save(); tox_weechat_data_save();
tox_weechat_identity_free_all(); tox_weechat_identity_free_all();
return WEECHAT_RC_OK; return WEECHAT_RC_OK;