瀏覽代碼

* Port [3157] to 1.2.13
* Fix stupid files section output


svn: 3158

Bryan Drewery 19 年之前
父節點
當前提交
5d61a988e9
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 1 3
      src/dccutil.c
  2. 1 1
      src/lang.h

+ 1 - 3
src/dccutil.c

@@ -761,10 +761,8 @@ detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
 void
 void
 do_boot(int idx, char *by, char *reason)
 do_boot(int idx, char *by, char *reason)
 {
 {
-  int files = (dcc[idx].type != &DCC_CHAT);
-
   dprintf(idx, DCC_BOOTED1);
   dprintf(idx, DCC_BOOTED1);
-  dprintf(idx, DCC_BOOTED2, files ? "file section" : "bot", by, reason[0] ? ": " : ".", reason);
+  dprintf(idx, DCC_BOOTED2, by, reason[0] ? ": " : ".", reason);
   /* If it's a partyliner (chatterer :) */
   /* If it's a partyliner (chatterer :) */
   /* Horrible assumption that DCT_CHAT using structure uses same format
   /* Horrible assumption that DCT_CHAT using structure uses same format
    * as DCC_CHAT */
    * as DCC_CHAT */

+ 1 - 1
src/lang.h

@@ -132,7 +132,7 @@
 #define DCC_ENTERPASS		"Enter your password"
 #define DCC_ENTERPASS		"Enter your password"
 #define DCC_FLOODBOOT		"%s has been forcibly removed for flooding.\n"
 #define DCC_FLOODBOOT		"%s has been forcibly removed for flooding.\n"
 #define DCC_BOOTED1		"-=- poof -=-\n"
 #define DCC_BOOTED1		"-=- poof -=-\n"
-#define DCC_BOOTED2		"You've been booted from the %s by %s%s%s\n"
+#define DCC_BOOTED2		"You've been booted from the bot by %s%s%s\n"
 #define DCC_BOOTED3		"%s booted %s from the party line%s%s"
 #define DCC_BOOTED3		"%s booted %s from the party line%s%s"
 
 
 /* Stuff from chan.c
 /* Stuff from chan.c