_win_show_history takes ProfChatWin as first arg

1 files changed, 55 insertions, 66 deletions

diff --git a/src/ui/core.c b/src/ui/core.c
index 698b4e98..ff429e33 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -88,7 +88,7 @@ static Display *display;
 static GTimer *ui_idle_time;
 
 //static void _win_handle_switch(const wint_t ch);
-static void _win_show_history(int win_index, const char * const contact);
+static void _win_show_history(ProfChatWin *chatwin, const char * const contact);
 static void _ui_draw_term_title(void);
 
 void
@@ -441,7 +441,7 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
 
         chatwin->unread++;
         if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-            _win_show_history(num, barejid);
+            _win_show_history(chatwin, barejid);
         }
 
         // show users status first, when receiving message via delayed delivery
@@ -501,19 +501,14 @@ ui_incoming_private_msg(const char * const fulljid, const char * const message,
 
     // not currently viewing chat window with sender
     } else {
+        privatewin->unread++;
         status_bar_new(num);
         cons_show_incoming_message(display_from, num);
+        win_print_incoming_message(window, tv_stamp, display_from, message);
 
         if (prefs_get_boolean(PREF_FLASH)) {
             flash();
         }
-
-        privatewin->unread++;
-        if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-            _win_show_history(num, fulljid);
-        }
-
-        win_print_incoming_message(window, tv_stamp, display_from, message);
     }
 
     int ui_index = num;
@@ -1365,30 +1360,6 @@ ui_recipient_gone(const char * const barejid, const char * const resource)
     }
 }
 
-ProfWin*
-ui_new_chat_win(const char * const barejid)
-{
-    ProfWin* window = wins_new_chat(barejid);
-
-    int num = wins_get_num(window);
-
-    if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-        _win_show_history(num, barejid);
-    }
-
-    // if the contact is offline, show a message
-    PContact contact = roster_get_contact(barejid);
-    if (contact != NULL) {
-        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 window;
-}
-
 void
 ui_new_private_win(const char * const fulljid)
 {
@@ -1424,6 +1395,29 @@ ui_open_xmlconsole_win(void)
     }
 }
 
+ProfWin*
+ui_new_chat_win(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 != NULL) {
+        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 window;
+}
+
 void
 ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id)
 {
@@ -1443,7 +1437,7 @@ ui_outgoing_chat_msg(const char * const barejid, const char * const message, cha
         num = wins_get_num(window);
 
         if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-            _win_show_history(num, barejid);
+            _win_show_history(chatwin, barejid);
         }
 
         if (contact != NULL) {
@@ -1488,7 +1482,7 @@ ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const messa
         num = wins_get_num(window);
 
         if (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
-            _win_show_history(num, barejid);
+            _win_show_history(chatwin, barejid);
         }
 
         if (contact != NULL) {
@@ -3003,39 +2997,34 @@ ui_hide_roster(void)
 }
 
 static void
-_win_show_history(int win_index, const char * const contact)
-{
-    ProfWin *window = wins_get_by_num(win_index);
-    if (window->type == WIN_CHAT) {
-        ProfChatWin *chatwin = (ProfChatWin*) window;
-        assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
-        if (!chatwin->history_shown) {
-            Jid *jid = jid_create(jabber_get_fulljid());
-            GSList *history = chat_log_get_previous(jid->barejid, contact);
-            jid_destroy(jid);
-            GSList *curr = history;
-            while (curr != NULL) {
-                char *line = curr->data;
-                // entry
-                if (line[2] == ':') {
-                    char hh[3]; memcpy(hh, &line[0], 2); hh[2] = '\0'; int ihh = atoi(hh);
-                    char mm[3]; memcpy(mm, &line[3], 2); mm[2] = '\0'; int imm = atoi(mm);
-                    char ss[3]; memcpy(ss, &line[6], 2); ss[2] = '\0'; int iss = atoi(ss);
-                    GDateTime *time = g_date_time_new_local(2000, 1, 1, ihh, imm, iss);
-                    GTimeVal tv;
-                    g_date_time_to_timeval(time, &tv);
-                    win_print(window, '-', &tv, NO_COLOUR_DATE, 0, "", curr->data+11);
-                    g_date_time_unref(time);
-                // header
-                } else {
-                    win_print(window, '-', NULL, 0, 0, "", curr->data);
-                }
-                curr = g_slist_next(curr);
+_win_show_history(ProfChatWin *chatwin, const char * const contact)
+{
+    if (!chatwin->history_shown) {
+        Jid *jid = jid_create(jabber_get_fulljid());
+        GSList *history = chat_log_get_previous(jid->barejid, contact);
+        jid_destroy(jid);
+        GSList *curr = history;
+        while (curr != NULL) {
+            char *line = curr->data;
+            // entry
+            if (line[2] == ':') {
+                char hh[3]; memcpy(hh, &line[0], 2); hh[2] = '\0'; int ihh = atoi(hh);
+                char mm[3]; memcpy(mm, &line[3], 2); mm[2] = '\0'; int imm = atoi(mm);
+                char ss[3]; memcpy(ss, &line[6], 2); ss[2] = '\0'; int iss = atoi(ss);
+                GDateTime *time = g_date_time_new_local(2000, 1, 1, ihh, imm, iss);
+                GTimeVal tv;
+                g_date_time_to_timeval(time, &tv);
+                win_print((ProfWin*)chatwin, '-', &tv, NO_COLOUR_DATE, 0, "", curr->data+11);
+                g_date_time_unref(time);
+            // header
+            } else {
+                win_print((ProfWin*)chatwin, '-', NULL, 0, 0, "", curr->data);
             }
-            chatwin->history_shown = TRUE;
-
-            g_slist_free_full(history, free);
+            curr = g_slist_next(curr);
         }
+        chatwin->history_shown = TRUE;
+
+        g_slist_free_full(history, free);
     }
 }