# HG changeset patch
# User Frank Zschockelt
# Date 1171455942 -3600
# Node ID cae430fcd385c31942fd495bdcd0ff90dce69789
# Parent  3b9bbf6c4c93ce87c8103a7407981560530cdf10
Mcabber will load symlinked histories only once, now.

diff -r 3b9bbf6c4c93 -r cae430fcd385 mcabber/src/screen.c
--- a/mcabber/src/screen.c	Wed Feb 14 13:24:53 2007 +0100
+++ b/mcabber/src/screen.c	Wed Feb 14 13:25:42 2007 +0100
@@ -412,6 +412,29 @@
   g_free(btext);
 }
 
+static winbuf *scr_SearchWindow(const char *winId, int special)
+{
+  char *id;
+  winbuf *wbp;
+
+  if (special)
+    return statusWindow; // Only one special window atm.
+
+  if (!winId)
+    return NULL;
+
+  id = g_strdup(winId);
+  mc_strtolower(id);
+  wbp = g_hash_table_lookup(winbufhash, id);
+  g_free(id);
+  return wbp;
+}
+
+int scr_BuddyBufferExists(const char *bjid)
+{
+  return (scr_SearchWindow(bjid, FALSE) != NULL);
+}
+
 //  scr_new_buddy(title, dontshow)
 // Note: title (aka winId/jid) can be NULL for special buffers
 static winbuf *scr_new_buddy(const char *title, int dont_show)
@@ -436,8 +459,16 @@
   // If title is NULL, this is a special buffer
   if (title) {
     char *id;
-    // Load buddy history from file (if enabled)
-    hlog_read_history(title, &tmp->hbuf, maxX - Roster_Width - PREFIX_WIDTH);
+    id = hlog_get_log_jid(title);
+    if (id) {
+      if(scr_BuddyBufferExists(id))
+        tmp->hbuf=(scr_SearchWindow(id, FALSE))->hbuf;
+      else
+        tmp->hbuf=(scr_new_buddy(id, TRUE))->hbuf;
+      g_free(id);
+    }
+    else // Load buddy history from file (if enabled)
+      hlog_read_history(title, &tmp->hbuf, maxX - Roster_Width - PREFIX_WIDTH);
 
     id = g_strdup(title);
     mc_strtolower(id);
@@ -446,29 +477,6 @@
   return tmp;
 }
 
-static winbuf *scr_SearchWindow(const char *winId, int special)
-{
-  char *id;
-  winbuf *wbp;
-
-  if (special)
-    return statusWindow; // Only one special window atm.
-
-  if (!winId)
-    return NULL;
-
-  id = g_strdup(winId);
-  mc_strtolower(id);
-  wbp = g_hash_table_lookup(winbufhash, id);
-  g_free(id);
-  return wbp;
-}
-
-int scr_BuddyBufferExists(const char *bjid)
-{
-  return (scr_SearchWindow(bjid, FALSE) != NULL);
-}
-
 //  scr_UpdateWindow()
 // (Re-)Display the given chat window.
 static void scr_UpdateWindow(winbuf *win_entry)
@@ -567,7 +575,7 @@
   }
   g_free(lines);
 }
-
+    
 static winbuf * scr_CreateWindow(const char *winId, int special, int dont_show)
 {
   if (special) {