about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2012-11-10 18:12:48 +0000
committerJames Booth <boothj5@gmail.com>2012-11-10 18:12:48 +0000
commitca9d390fcf321a8c3f6996e9893c251b7a93b74a (patch)
tree696e5ae916900a6eedc98b95e6c156112ca78be5
parentc0f9b61f082189a4aa1c57d990e9374ae7652396 (diff)
downloadprofani-tty-ca9d390fcf321a8c3f6996e9893c251b7a93b74a.tar.gz
Renamed jid->room in room_chat
-rw-r--r--src/room_chat.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/room_chat.c b/src/room_chat.c
index 72a4b38e..8ba3b6b1 100644
--- a/src/room_chat.c
+++ b/src/room_chat.c
@@ -28,7 +28,7 @@
 #include <contact.h>
 
 typedef struct _muc_room_t {
-    char *jid;
+    char *room;
     char *nick;
     GHashTable *roster;
     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));
-    new_room->jid = strdup(jid);
+    new_room->room = strdup(jid);
     new_room->nick = strdup(nick);
     new_room->roster = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
         (GDestroyNotify)p_contact_free);
@@ -190,9 +190,9 @@ static void
 _room_free(muc_room *room)
 {
     if (room != NULL) {
-        if (room->jid != NULL) {
-            g_free(room->jid);
-            room->jid = NULL;
+        if (room->room != NULL) {
+            g_free(room->room);
+            room->room = NULL;
         }
         if (room->nick != NULL) {
             g_free(room->nick);