From 031e906035f27da3021f1dfb5acb8c9587b853ac Mon Sep 17 00:00:00 2001
From: Paul Fariello <paul@fariello.eu>
Date: Fri, 15 Mar 2019 22:58:01 +0100
Subject: [PATCH] Cosmetics rename variable barejid into roomjid

---
 src/command/cmd_funcs.c | 2 +-
 src/omemo/omemo.c       | 4 ++--
 src/omemo/omemo.h       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index a882fa6d..f21da6e7 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -7978,7 +7978,7 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args)
 
             /* TODO: Check room is configured correctly, no anonymous and access to
              * full jid */
-            omemo_start_muc_sessions(mucwin->barejid);
+            omemo_start_muc_sessions(mucwin->roomjid);
 
             mucwin->is_omemo = TRUE;
         } else {
diff --git a/src/omemo/omemo.c b/src/omemo/omemo.c
index 29899cc1..f7a305ee 100644
--- a/src/omemo/omemo.c
+++ b/src/omemo/omemo.c
@@ -295,9 +295,9 @@ omemo_start_session(const char *const barejid)
 }
 
 void
-omemo_start_muc_sessions(const char *const barejid)
+omemo_start_muc_sessions(const char *const roomjid)
 {
-    GList *roster = muc_roster(barejid);
+    GList *roster = muc_roster(roomjid);
     GList *iter;
     for (iter = roster; iter != NULL; iter = iter->next) {
         Occupant *occupant = (Occupant *)iter->data;
diff --git a/src/omemo/omemo.h b/src/omemo/omemo.h
index 6686cee2..b56b50a5 100644
--- a/src/omemo/omemo.h
+++ b/src/omemo/omemo.h
@@ -36,7 +36,7 @@ void omemo_trust(const char *const jid, const char *const fingerprint);
 void omemo_untrust(const char *const jid, const char *const fingerprint);
 
 void omemo_start_session(const char *const barejid);
-void omemo_start_muc_sessions(const char *const barejid);
+void omemo_start_muc_sessions(const char *const roomjid);
 void omemo_start_device_session(const char *const jid, uint32_t device_id, GList *prekeys, uint32_t signed_prekey_id, const unsigned char *const signed_prekey, size_t signed_prekey_len, const unsigned char *const signature, size_t signature_len, const unsigned char *const identity_key, size_t identity_key_len);
 
 gboolean omemo_loaded(void);