changeset 847:e1b7f71b0b1c

Improve readability for some commands Use HBB_PREFIX_NONE in /info, /room names & /room whois.
author Mikael Berthe <mikael@lilotux.net>
date Mon, 08 May 2006 22:38:30 +0200
parents 683516b450be
children a9161d2dc414
files mcabber/src/commands.c mcabber/src/hbuf.h
diffstat 2 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/commands.c	Sun May 07 16:01:44 2006 +0200
+++ b/mcabber/src/commands.c	Mon May 08 22:38:30 2006 +0200
@@ -1108,14 +1108,14 @@
       scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
       if (rst_msg) {
         snprintf(buffer, 4095, "Status message: %s", rst_msg);
-        scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+        scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
       }
       if (rst_time) {
         char tbuf[128];
 
         strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time));
         snprintf(buffer, 127, "Status timestamp: %s", tbuf);
-        scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+        scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
       }
     }
   } else {
@@ -1162,7 +1162,7 @@
     scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
     if (rst_msg) {
       snprintf(buffer, 4095, "Status message: %s", rst_msg);
-      scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+      scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
     }
   }
 
@@ -1855,27 +1855,27 @@
   scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
   snprintf(buffer, 4095, "Status   : [%c] %s", imstatus2char[rstatus],
            rst_msg);
-  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
 
   if (rst_time) {
     char tbuf[128];
 
     strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", localtime(&rst_time));
     snprintf(buffer, 127, "Timestamp: %s", tbuf);
-    scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+    scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
   }
 
   if (realjid) {
     snprintf(buffer, 4095, "JID      : <%s>", realjid);
-    scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+    scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
   }
 
   snprintf(buffer, 4095, "Role     : %s", strroles[role]);
-  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
   snprintf(buffer, 4095, "Affiliat.: %s", straffil[affil]);
-  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
   snprintf(buffer, 4095, "Priority : %d", rprio);
-  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(jid, buffer, 0, HBB_PREFIX_NONE);
 
   scr_WriteIncomingMessage(jid, "End of WHOIS", 0, HBB_PREFIX_INFO);
 
--- a/mcabber/src/hbuf.h	Sun May 07 16:01:44 2006 +0200
+++ b/mcabber/src/hbuf.h	Mon May 08 22:38:30 2006 +0200
@@ -14,14 +14,15 @@
 #define HBB_FLAG_ALLOC      1
 #define HBB_FLAG_PERSISTENT 2
 
-#define HBB_PREFIX_IN       1
-#define HBB_PREFIX_OUT      2
-#define HBB_PREFIX_STATUS   4
-#define HBB_PREFIX_AUTH     8
-#define HBB_PREFIX_INFO    16
-#define HBB_PREFIX_ERR     32
-#define HBB_PREFIX_NOFLAG  64
-#define HBB_PREFIX_HLIGHT 128
+#define HBB_PREFIX_IN          1
+#define HBB_PREFIX_OUT         2
+#define HBB_PREFIX_STATUS      4
+#define HBB_PREFIX_AUTH        8
+#define HBB_PREFIX_INFO       16
+#define HBB_PREFIX_ERR        32
+#define HBB_PREFIX_NOFLAG     64
+#define HBB_PREFIX_HLIGHT    128
+#define HBB_PREFIX_NONE      256
 
 typedef struct {
   time_t timestamp;