# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1133477662 -3600
# Node ID 64cb4de949722d85ccd0c37f73727ed9d11a712f
# Parent  4eb579399613d597d86e02428664dd5722dba733
Better topic attribution
Better topic attribution, when getting history from the server.


diff -r 4eb579399613 -r 64cb4de94972 mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Thu Dec 01 23:47:16 2005 +0100
+++ b/mcabber/src/jabglue.c	Thu Dec 01 23:54:22 2005 +0100
@@ -1251,8 +1251,14 @@
       if (roombuddy)
         buddy_settopic(roombuddy->data, subj_noutf8);
       // Display inside the room window
-      mbuf = g_strdup_printf("%s has set the topic to: %s", r,
-                             (subj_noutf8 ? subj_noutf8 : "(?)"));
+      if (r == s) {
+        // No specific resource (this is certainly history)
+        mbuf = g_strdup_printf("The topic has been set to: %s",
+                               (subj_noutf8 ? subj_noutf8 : "(?)"));
+      } else {
+        mbuf = g_strdup_printf("%s has set the topic to: %s", r,
+                               (subj_noutf8 ? subj_noutf8 : "(?)"));
+      }
       scr_WriteIncomingMessage(s, mbuf, 0,
                                HBB_PREFIX_INFO|HBB_PREFIX_NOFLAG);
       if (settings_opt_get_int("log_muc_conf"))