devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Use libstrophe/libmesode uuid generator

Browse Source
This commit is contained in:
James Booth
2015-10-12 23:37:11 +01:00
parent de15d47be4
commit 6e28df66e8
5 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/command/commands.c
View File

@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
#include <uuid/uuid.h>
#include <glib.h>
#include "chat_session.h"
@@ -2267,22 +2266,18 @@ cmd_join(ProfWin *window, const char * const command, gchar **args)
}
if (args[0] == NULL) {
uuid_t uuid;
uuid_generate(uuid);
char *uuid_str = malloc(sizeof(char) * 37);
uuid_unparse_lower(uuid, uuid_str);
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
GString *room_str = g_string_new("");
g_string_append_printf(room_str, "private-chat-%s@%s", uuid_str, account->muc_service);
char *uuid = jabber_create_uuid();
g_string_append_printf(room_str, "private-chat-%s@%s", uuid, account->muc_service);
jabber_free_uuid(uuid);
presence_join_room(room_str->str, account->muc_nick, NULL);
muc_join(room_str->str, account->muc_nick, NULL, FALSE);
g_string_free(room_str, TRUE);
free(uuid_str);
account_free(account);
return TRUE;