From 3e1832b02e5f994619ff3fdd2165d6326ab3e4db Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 10 Jan 2015 18:17:10 +0000
Subject: [PATCH] Renamed resource -> resource_override

---
 src/command/commands.c | 4 ++--
 src/ui/core.c          | 2 +-
 src/ui/titlebar.c      | 8 ++++----
 src/ui/window.c        | 4 ++--
 src/ui/window.h        | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/command/commands.c b/src/command/commands.c
index 049582c0..7f902836 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1617,11 +1617,11 @@ cmd_resource(gchar **args, struct cmd_help_t help)
             return TRUE;
         }
 
-        chatwin->resource = strdup(resource);
+        chatwin->resource_override = strdup(resource);
         return TRUE;
 
     } else if (g_strcmp0(cmd, "off") == 0) {
-        FREE_SET_NULL(chatwin->resource);
+        FREE_SET_NULL(chatwin->resource_override);
         return TRUE;
     } else {
         cons_show("Usage: %s", help.usage);
diff --git a/src/ui/core.c b/src/ui/core.c
index 8eb9025b..84a157d7 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -926,7 +926,7 @@ ui_gone_secure(const char * const barejid, gboolean trusted)
         chatwin = (ProfChatWin*)window;
     }
 
-    FREE_SET_NULL(chatwin->resource);
+    FREE_SET_NULL(chatwin->resource_override);
 
     chatwin->is_otr = TRUE;
     chatwin->is_trusted = trusted;
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 15f8efca..368309e9 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -307,9 +307,9 @@ static void
 _show_contact_presence(ProfChatWin *chatwin)
 {
     int bracket_attrs = theme_attrs(THEME_TITLE_BRACKET);
-    if (chatwin && chatwin->resource) {
+    if (chatwin && chatwin->resource_override) {
         wprintw(win, "/");
-        wprintw(win, chatwin->resource);
+        wprintw(win, chatwin->resource_override);
     }
 
     if (prefs_get_boolean(PREF_PRESENCE)) {
@@ -318,8 +318,8 @@ _show_contact_presence(ProfChatWin *chatwin)
 
         PContact contact = roster_get_contact(chatwin->barejid);
         if (contact) {
-            if (chatwin && chatwin->resource) {
-                Resource *resource = p_contact_get_resource(contact, chatwin->resource);
+            if (chatwin && chatwin->resource_override) {
+                Resource *resource = p_contact_get_resource(contact, chatwin->resource_override);
                 if (resource) {
                     presence = string_from_resource_presence(resource->presence);
                 }
diff --git a/src/ui/window.c b/src/ui/window.c
index dd459ece..f03faadf 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -132,7 +132,7 @@ win_create_chat(const char * const barejid)
     new_win->window.layout = _win_create_simple_layout();
 
     new_win->barejid = strdup(barejid);
-    new_win->resource = NULL;
+    new_win->resource_override = NULL;
     new_win->is_otr = FALSE;
     new_win->is_trusted = FALSE;
     new_win->history_shown = FALSE;
@@ -333,7 +333,7 @@ win_free(ProfWin* window)
     if (window->type == WIN_CHAT) {
         ProfChatWin *chatwin = (ProfChatWin*)window;
         free(chatwin->barejid);
-        free(chatwin->resource);
+        free(chatwin->resource_override);
     }
 
     if (window->type == WIN_MUC) {
diff --git a/src/ui/window.h b/src/ui/window.h
index 0f04faae..b17eb262 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -111,7 +111,7 @@ typedef struct prof_chat_win_t {
     int unread;
     gboolean is_otr;
     gboolean is_trusted;
-    char *resource;
+    char *resource_override;
     gboolean history_shown;
     unsigned long memcheck;
 } ProfChatWin;