# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1203539214 -3600
# Node ID 12847b0ea8c9f49cb2fcd5b6256f2555631a5796
# Parent  99d95d4ea806322a07bc28c3b18ff87f08f0af72
Add an option "-q" (quiet) to /say_to
New prototype: /SAY_TO [-q] jid message
Useful for non-interactive commands (FIFO, external sourced files...)

diff -r 99d95d4ea806 -r 12847b0ea8c9 mcabber/src/commands.c
--- a/mcabber/src/commands.c	Wed Feb 20 07:49:11 2008 +0100
+++ b/mcabber/src/commands.c	Wed Feb 20 21:26:54 2008 +0100
@@ -1074,7 +1074,7 @@
 }
 
 static int send_message_to(const char *fjid, const char *msg, const char *subj,
-                           const char *type_overwrite)
+                           const char *type_overwrite, bool quiet)
 {
   char *bare_jid, *rp;
   char *hmsg;
@@ -1102,11 +1102,15 @@
 
   // We must use the bare jid in hk_message_out()
   rp = strchr(fjid, JID_RESOURCE_SEPARATOR);
-  if (rp) bare_jid = g_strndup(fjid, rp - fjid);
-  else   bare_jid = (char*)fjid;
-
-  // Jump to window, create one if needed
-  scr_RosterJumpJid(bare_jid);
+  if (rp)
+    bare_jid = g_strndup(fjid, rp - fjid);
+  else
+    bare_jid = (char*)fjid;
+
+  if (!quiet) {
+    // Jump to window, create one if needed
+    scr_RosterJumpJid(bare_jid);
+  }
 
   // Check if we're sending a message to a conference room
   // If not, we must make sure rp is NULL, for hk_message_out()
@@ -1163,7 +1167,7 @@
     return;
   }
 
-  send_message_to(bjid, msg, subj, type_overwrite);
+  send_message_to(bjid, msg, subj, type_overwrite, FALSE);
 }
 
 static const char *scan_mtype(char **arg)
@@ -1301,7 +1305,8 @@
     arg = to_utf8(arg);
     msg_utf8 = to_utf8(scr_get_multiline());
     if (msg_utf8) {
-      err = send_message_to(arg, msg_utf8, scr_get_multimode_subj(), msg_type);
+      err = send_message_to(arg, msg_utf8, scr_get_multimode_subj(), msg_type,
+                            FALSE);
       g_free(msg_utf8);
     }
     g_free(arg);
@@ -1341,6 +1346,7 @@
   char **paramlst;
   char *fjid, *msg;
   const char *msg_type = NULL;
+  bool quiet = FALSE;
 
   if (!jb_getonline()) {
     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
@@ -1348,7 +1354,16 @@
   }
 
   msg_type = scan_mtype(&arg);
-  paramlst = split_arg(arg, 2, 1); // jid, message
+  paramlst = split_arg(arg, 2, 1); // jid, message (or option, jid, message)
+
+  // Check for an option parameter
+  if (*paramlst && !strcmp(*paramlst, "-q")) {
+    char **oldparamlst = paramlst;
+    paramlst = split_arg(*(oldparamlst+1), 2, 1); // jid, message
+    free_arg_lst(oldparamlst);
+    quiet = TRUE;
+  }
+
   fjid = *paramlst;
   msg = *(paramlst+1);
 
@@ -1361,7 +1376,7 @@
   fjid = to_utf8(fjid);
   msg = to_utf8(msg);
 
-  send_message_to(fjid, msg, NULL, msg_type);
+  send_message_to(fjid, msg, NULL, msg_type, quiet);
 
   g_free(fjid);
   g_free(msg);
@@ -2387,7 +2402,7 @@
   fjid = g_strdup_printf("%s/%s", buddy_getjid(bud), nick);
   fjid_utf8 = to_utf8(fjid);
   msg = to_utf8(arg);
-  send_message_to(fjid_utf8, msg, NULL, NULL);
+  send_message_to(fjid_utf8, msg, NULL, NULL, FALSE);
   g_free(fjid);
   g_free(fjid_utf8);
   g_free(msg);