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

Fixed identity initialization.

Browse source
This commit is contained in:
Håvard Pettersson 2014-09-08 03:01:29 +02:00
parent 026b43e599
commit b8e0a9d70c
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/tox-weechat-tox.c
View file

@ -285,13 +285,7 @@ tox_weechat_bootstrap(char *address, uint16_t port, char *public_key)
void void
tox_weechat_tox_init() tox_weechat_tox_init()
{ {
struct t_tox_weechat_identity *identity = malloc(sizeof(*identity)); tox_weechat_identity_new("tox");
identity->name = strdup("tox");
identity->data_path = tox_weechat_default_data_path("tox");
tox_weechat_init_identity(identity);
tox_weechat_identities = identity;
} }
struct t_tox_weechat_identity * struct t_tox_weechat_identity *
@ -299,12 +293,21 @@ tox_weechat_identity_new(const char *name)
{ {
struct t_tox_weechat_identity *identity = malloc(sizeof(*identity)); struct t_tox_weechat_identity *identity = malloc(sizeof(*identity));
identity->name = strdup(name); identity->name = strdup(name);
identity->data_path = tox_weechat_default_data_path("tox");
// TODO: add close callback // TODO: add close callback
identity->buffer = weechat_buffer_new(identity->name, NULL, NULL, NULL, NULL); identity->buffer = weechat_buffer_new(identity->name, NULL, NULL, NULL, NULL);
identity->tox = tox_new(NULL); identity->tox = tox_new(NULL);
// try loading Tox saved data
if (tox_weechat_load_file(identity->tox, identity->data_path) == -1)
{
// couldn't load Tox, set a default name
tox_set_name(identity->tox,
(uint8_t *)INITIAL_NAME, strlen(INITIAL_NAME));
}
identity->prev_identity= tox_weechat_last_identity; identity->prev_identity= tox_weechat_last_identity;
identity->next_identity = NULL; identity->next_identity = NULL;
@ -315,20 +318,6 @@ tox_weechat_identity_new(const char *name)
tox_weechat_last_identity = identity; tox_weechat_last_identity = identity;
return identity;
}
void
tox_weechat_init_identity(struct t_tox_weechat_identity *identity)
{
// try loading Tox saved data
if (tox_weechat_load_file(identity->tox, identity->data_path) == -1)
{
// couldn't load Tox, set a default name
tox_set_name(identity->tox,
(uint8_t *)INITIAL_NAME, strlen(INITIAL_NAME));
}
// bootstrap DHT // bootstrap DHT
tox_weechat_bootstrap_tox(identity->tox, BOOTSTRAP_ADDRESS, tox_weechat_bootstrap_tox(identity->tox, BOOTSTRAP_ADDRESS,
BOOTSTRAP_PORT, BOOTSTRAP_PORT,
@ -345,6 +334,8 @@ tox_weechat_init_identity(struct t_tox_weechat_identity *identity)
tox_callback_user_status(identity->tox, tox_weechat_user_status_callback, identity); tox_callback_user_status(identity->tox, tox_weechat_user_status_callback, identity);
tox_callback_status_message(identity->tox, tox_weechat_status_message_callback, identity); tox_callback_status_message(identity->tox, tox_weechat_status_message_callback, identity);
tox_callback_friend_request(identity->tox, tox_weechat_callback_friend_request, identity); tox_callback_friend_request(identity->tox, tox_weechat_callback_friend_request, identity);
return identity;
} }
struct t_tox_weechat_identity * struct t_tox_weechat_identity *

3
src/tox-weechat-tox.h
View file

@ -36,7 +36,8 @@ void tox_weechat_tox_init();
struct t_tox_weechat_identity *tox_weechat_identity_for_buffer(struct t_gui_buffer *buffer); struct t_tox_weechat_identity *tox_weechat_identity_for_buffer(struct t_gui_buffer *buffer);
void tox_weechat_init_identity(struct t_tox_weechat_identity *identity); struct t_tox_weechat_identity *
tox_weechat_identity_new(const char *name);
/** /**
* Bootstrap DHT using an inet address, port and a Tox address. * Bootstrap DHT using an inet address, port and a Tox address.