From 70f7db0d918d80b41bcf114a5f42dea376b6035e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Thu, 11 Dec 2014 00:02:51 +0000
Subject: Subscription handler uses wins_new_chat

---
 src/ui/core.c | 14 +++++---------
 src/ui/ui.h   |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/ui/core.c b/src/ui/core.c
index 4014f53e..82ff5283 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1321,17 +1321,15 @@ _ui_current_error_line(const char * const msg)
 }
 
 static void
-_ui_print_system_msg_from_recipient(const char * const from, const char *message)
+_ui_print_system_msg_from_recipient(const char * const barejid, const char *message)
 {
-    if (from == NULL || message == NULL)
+    if (barejid == NULL || message == NULL)
         return;
 
-    Jid *jid = jid_create(from);
-
-    ProfWin *window = wins_get_by_recipient(jid->barejid);
+    ProfWin *window = wins_get_by_recipient(barejid);
     if (window == NULL) {
         int num = 0;
-        window = wins_new(jid->barejid, WIN_CHAT);
+        window = wins_new_chat(barejid);
         if (window != NULL) {
             num = wins_get_num(window);
             status_bar_active(num);
@@ -1342,9 +1340,7 @@ _ui_print_system_msg_from_recipient(const char * const from, const char *message
         }
     }
 
-    win_save_vprint(window, '-', NULL, 0, 0, "", "*%s %s", jid->barejid, message);
-
-    jid_destroy(jid);
+    win_save_vprint(window, '-', NULL, 0, 0, "", "*%s %s", barejid, message);
 }
 
 static void
diff --git a/src/ui/ui.h b/src/ui/ui.h
index b1535def..f7a870f9 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -88,7 +88,7 @@ void (*ui_smp_answer_failure)(const char * const recipient);
 unsigned long (*ui_get_idle_time)(void);
 void (*ui_reset_idle_time)(void);
 void (*ui_new_chat_win)(const char * const to);
-void (*ui_print_system_msg_from_recipient)(const char * const from, const char *message);
+void (*ui_print_system_msg_from_recipient)(const char * const barejid, const char *message);
 gint (*ui_unread)(void);
 void (*ui_close_connected_win)(int index);
 int (*ui_close_all_wins)(void);
-- 
cgit 1.4.1-2-gfad0