# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1121421375 -3600
# Node ID 65aa055205563d7ec6b949ed2d900d14dbfea8c2
# Parent  1ceb68eb2fc1b116c571387f114f0302bce8f5f1
First Ctrl-C now also leaves multi-line message mode

* First Ctrl-C does a "/msay abort" command
* Remove debug stuff
* "/msay abort" displays a message when leaving multi-line mode


diff -r 1ceb68eb2fc1 -r 65aa05520556 mcabber/src/commands.c
--- a/mcabber/src/commands.c	Thu Jul 14 23:24:22 2005 +0100
+++ b/mcabber/src/commands.c	Fri Jul 15 10:56:15 2005 +0100
@@ -498,6 +498,8 @@
   gpointer bud;
 
   if (!strcasecmp(arg, "abort")) {
+    if (scr_get_multimode())
+      scr_LogPrint("Leaving multi-line message mode");
     scr_set_multimode(FALSE);
     return;
   } else if ((!strcasecmp(arg, "begin")) || (!strcasecmp(arg, "verbatim"))) {
diff -r 1ceb68eb2fc1 -r 65aa05520556 mcabber/src/main.c
--- a/mcabber/src/main.c	Thu Jul 14 23:24:22 2005 +0100
+++ b/mcabber/src/main.c	Fri Jul 15 10:56:15 2005 +0100
@@ -124,8 +124,8 @@
       mcabber_disconnect("Killed by SIGINT");
     LastSigtermTime = now;
     signal(SIGINT, sig_handler);
+    scr_handle_sigint();
     scr_LogPrint("Hit Ctrl-C twice to leave mcabber");
-    scr_handle_sigint();
   } else {
     ut_WriteLog("Caught signal: %d\n", signum);
   }
diff -r 1ceb68eb2fc1 -r 65aa05520556 mcabber/src/screen.c
--- a/mcabber/src/screen.c	Thu Jul 14 23:24:22 2005 +0100
+++ b/mcabber/src/screen.c	Fri Jul 15 10:56:15 2005 +0100
@@ -1492,7 +1492,8 @@
 
 void scr_handle_sigint(void)
 {
-  scr_LogPrint("In screen. completion_started=%d", completion_started);
+  // Leave multi-line mode
+  process_command("/msay abort");
   // Same as Ctrl-g, now
   scr_cancel_current_completion();
   scr_end_current_completion();