From af1124f28ffc95a09d88d1fad25c31554106acd7 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 27 Oct 2015 23:18:42 +0000
Subject: Renamed ui_incoming_msg -> chatwin_incoming_msg

---
 src/ui/chatwin.c | 48 ++++++++++++++++++++++++------------------------
 src/ui/ui.h      |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 2ef35b10..1202be9c 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -47,6 +47,29 @@
 
 static void _win_show_history(ProfChatWin *chatwin, const char *const contact);
 
+ProfChatWin*
+chatwin_new(const char *const barejid)
+{
+    ProfWin *window = wins_new_chat(barejid);
+    ProfChatWin *chatwin = (ProfChatWin *)window;
+
+    if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
+        _win_show_history(chatwin, barejid);
+    }
+
+    // if the contact is offline, show a message
+    PContact contact = roster_get_contact(barejid);
+    if (contact) {
+        if (strcmp(p_contact_presence(contact), "offline") == 0) {
+            const char * const show = p_contact_presence(contact);
+            const char * const status = p_contact_status(contact);
+            win_show_status_string(window, barejid, show, status, NULL, "--", "offline");
+        }
+    }
+
+    return chatwin;
+}
+
 void
 chatwin_receipt_received(ProfChatWin *chatwin, const char *const id)
 {
@@ -197,31 +220,8 @@ chatwin_recipient_gone(ProfChatWin *chatwin)
     win_vprint((ProfWin*)chatwin, '!', 0, NULL, 0, THEME_GONE, "", "<- %s has left the conversation.", display_usr);
 }
 
-ProfChatWin*
-chatwin_new(const char *const barejid)
-{
-    ProfWin *window = wins_new_chat(barejid);
-    ProfChatWin *chatwin = (ProfChatWin *)window;
-
-    if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-        _win_show_history(chatwin, barejid);
-    }
-
-    // if the contact is offline, show a message
-    PContact contact = roster_get_contact(barejid);
-    if (contact) {
-        if (strcmp(p_contact_presence(contact), "offline") == 0) {
-            const char * const show = p_contact_presence(contact);
-            const char * const status = p_contact_status(contact);
-            win_show_status_string(window, barejid, show, status, NULL, "--", "offline");
-        }
-    }
-
-    return chatwin;
-}
-
 void
-ui_incoming_msg(ProfChatWin *chatwin, const char *const resource, const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode)
+chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource, const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode)
 {
     ProfWin *window = (ProfWin*)chatwin;
     int num = wins_get_num(window);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 1214fdab..fb56b6e1 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -99,7 +99,7 @@ void ui_handle_stanza(const char *const msg);
 // ui events
 void ui_contact_online(char *barejid, Resource *resource, GDateTime *last_activity);
 void ui_contact_typing(const char *const barejid, const char *const resource);
-void ui_incoming_msg(ProfChatWin *chatwin, const char *const resource,  const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
+void chatwin_incoming_msg(ProfChatWin *chatwin, const char *const resource,  const char *const message, GDateTime *timestamp, gboolean win_created, prof_enc_t enc_mode);
 void ui_incoming_private_msg(const char *const fulljid, const char *const message, GDateTime *timestamp);
 void chatwin_receipt_received(ProfChatWin *chatwin, const char *const id);
 
-- 
cgit 1.4.1-2-gfad0