1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Renamed jid->room in room_chat

This commit is contained in:
James Booth 2012-11-10 18:12:48 +00:00
parent c0f9b61f08
commit ca9d390fcf

View File

@ -28,7 +28,7 @@
#include <contact.h> #include <contact.h>
typedef struct _muc_room_t { typedef struct _muc_room_t {
char *jid; char *room;
char *nick; char *nick;
GHashTable *roster; GHashTable *roster;
gboolean roster_received; gboolean roster_received;
@ -47,7 +47,7 @@ room_join(const char * const jid, const char * const nick)
} }
muc_room *new_room = malloc(sizeof(muc_room)); muc_room *new_room = malloc(sizeof(muc_room));
new_room->jid = strdup(jid); new_room->room = strdup(jid);
new_room->nick = strdup(nick); new_room->nick = strdup(nick);
new_room->roster = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, new_room->roster = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)p_contact_free); (GDestroyNotify)p_contact_free);
@ -190,9 +190,9 @@ static void
_room_free(muc_room *room) _room_free(muc_room *room)
{ {
if (room != NULL) { if (room != NULL) {
if (room->jid != NULL) { if (room->room != NULL) {
g_free(room->jid); g_free(room->room);
room->jid = NULL; room->room = NULL;
} }
if (room->nick != NULL) { if (room->nick != NULL) {
g_free(room->nick); g_free(room->nick);