# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1219518074 -7200
# Node ID c74cfe7fd8481086b1c917c34e382e84bb6b0f50
# Parent  50dbbca69b554ea9425cdebc4357950d82abb13f
Add option --show-roster to command chat_disable.
This makes it possible to change the Esc binding so that
the roster doesn't automatically comes back when hitting Escape.
(Issue reported by Maxim Vuets)

diff -r 50dbbca69b55 -r c74cfe7fd848 mcabber/src/commands.c
--- a/mcabber/src/commands.c	Sat Aug 23 19:47:49 2008 +0300
+++ b/mcabber/src/commands.c	Sat Aug 23 21:01:14 2008 +0200
@@ -3568,7 +3568,14 @@
 
 static void do_chat_disable(char *arg)
 {
-  readline_disable_chat_mode();
+  guint show_roster;
+
+  if (arg && !strcasecmp(arg, "--show-roster"))
+    show_roster = 1;
+  else
+    show_roster = 0;
+
+  readline_disable_chat_mode(show_roster);
 }
 
 static void do_source(char *arg)
diff -r 50dbbca69b55 -r c74cfe7fd848 mcabber/src/screen.c
--- a/mcabber/src/screen.c	Sat Aug 23 19:47:49 2008 +0300
+++ b/mcabber/src/screen.c	Sat Aug 23 21:01:14 2008 +0200
@@ -665,7 +665,7 @@
   settings_set(SETTINGS_TYPE_BINDING, "517", "iline fword");
   settings_set(SETTINGS_TYPE_BINDING, "518", "iline fword");
   settings_set(SETTINGS_TYPE_BINDING, "12", "screen_refresh");    // Ctrl-l
-  settings_set(SETTINGS_TYPE_BINDING, "27", "chat_disable");      // Esc
+  settings_set(SETTINGS_TYPE_BINDING, "27", "chat_disable --show-roster");// Esc
   settings_set(SETTINGS_TYPE_BINDING, "M27", "chat_disable");     // Esc-Esc
   settings_set(SETTINGS_TYPE_BINDING, "4", "iline send_multiline"); // Ctrl-d
   settings_set(SETTINGS_TYPE_BINDING, "M117", "iline word_upcase"); // Meta-u
@@ -3173,14 +3173,15 @@
   redrawwin(stdscr);
 }
 
-void readline_disable_chat_mode(void)
+void readline_disable_chat_mode(guint show_roster)
 {
   scr_CheckAutoAway(TRUE);
   currentWindow = NULL;
   chatmode = FALSE;
   if (current_buddy)
     buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
-  scr_RosterVisibility(1);
+  if (show_roster)
+    scr_RosterVisibility(1);
   scr_UpdateChatStatus(FALSE);
   top_panel(chatPanel);
   top_panel(inputPanel);
diff -r 50dbbca69b55 -r c74cfe7fd848 mcabber/src/screen.h
--- a/mcabber/src/screen.h	Sat Aug 23 19:47:49 2008 +0300
+++ b/mcabber/src/screen.h	Sat Aug 23 21:01:14 2008 +0200
@@ -168,7 +168,7 @@
 void readline_cancel_completion(void);
 void readline_do_completion(void);
 void readline_refresh_screen(void);
-void readline_disable_chat_mode(void);
+void readline_disable_chat_mode(guint show_roster);
 void readline_hist_beginning_search_bwd(void);
 void readline_hist_beginning_search_fwd(void);
 void readline_hist_prev(void);