Moved chat resource to WIN_CHAT type

4 files changed, 11 insertions, 9 deletions

diff --git a/src/ui/core.c b/src/ui/core.c
index f8f564fc..c62d6b4d 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -888,7 +888,7 @@ _ui_gone_secure(const char * const recipient, gboolean trusted)
         return;
     }
 
-    FREE_SET_NULL(window->chat_resource);
+    FREE_SET_NULL(window->wins.chat.chat_resource);
 
     window->wins.chat.is_otr = TRUE;
     window->wins.chat.is_trusted = trusted;
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index cb593b4b..5c11c346 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -324,21 +324,21 @@ _show_contact_presence(void)
     int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET);
 
     ProfWin *current = wins_get_current();
-    if (current && current->chat_resource) {
+    if (current && current->wins.chat.chat_resource) {
         wprintw(win, "/");
-        wprintw(win, current->chat_resource);
+        wprintw(win, current->wins.chat.chat_resource);
     }
 
     if (prefs_get_boolean(PREF_PRESENCE)) {
         theme_item_t presence_colour = THEME_TITLE_OFFLINE;
         const char *presence = "offline";
 
-        if (current && current->chat_resource) {
+        if (current && current->wins.chat.chat_resource) {
             char *barejid = roster_barejid_from_name(current_recipient);
             if (barejid) {
                 PContact contact = roster_get_contact(barejid);
                 if (contact) {
-                    Resource *resource = p_contact_get_resource(contact, current->chat_resource);
+                    Resource *resource = p_contact_get_resource(contact, current->wins.chat.chat_resource);
                     if (resource) {
                         presence = string_from_resource_presence(resource->presence);
                     }
diff --git a/src/ui/window.c b/src/ui/window.c
index 89fde6c3..56225b67 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -122,10 +122,9 @@ win_create(const char * const title, win_type_t type)
     if (new_win->type == WIN_CHAT) {
         new_win->wins.chat.is_otr = FALSE;
         new_win->wins.chat.is_trusted = FALSE;
+        new_win->wins.chat.chat_resource = NULL;
     }
 
-    new_win->chat_resource = NULL;
-
     scrollok(new_win->win, TRUE);
 
     return new_win;
@@ -223,7 +222,10 @@ win_free(ProfWin* window)
         break;
     }
 
-    free(window->chat_resource);
+    if (window->type == WIN_CHAT) {
+        free(window->wins.chat.chat_resource);
+    }
+
     free(window->from);
 
     if (window->type == WIN_MUC_CONFIG) {
diff --git a/src/ui/window.h b/src/ui/window.h
index c74b7cae..f613c72a 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -71,7 +71,6 @@ typedef struct prof_win_t {
     WINDOW *win;
     ProfBuff buffer;
     char *from;
-    char *chat_resource;
     int y_pos;
     int paged;
     int unread;
@@ -87,6 +86,7 @@ typedef struct prof_win_t {
         struct {
             gboolean is_otr;
             gboolean is_trusted;
+            char *chat_resource;
         } chat;
 
         // WIN_MUC