--- a/fix-say-to	Mon Apr 05 16:37:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-diff -r 9bc6307e1a05 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Sun Apr 04 14:59:35 2010 +0200
-+++ b/mcabber/mcabber/commands.c	Mon Apr 05 16:35:15 2010 +0300
-@@ -1498,7 +1498,6 @@
-   char *file = NULL;
-   LmMessageSubType msg_type = LM_MESSAGE_SUB_TYPE_NOT_SET;
-   bool quiet = FALSE;
--  bool expandfjid = FALSE;
- 
-   if (!xmpp_is_online()) {
-     scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
-@@ -1527,6 +1526,7 @@
-       free_arg_lst(oldparamlst);
-       if (!*paramlst) {
-         scr_LogPrint(LPRINT_NORMAL, "Wrong usage.");
-+        free_arg_lst(paramlst);
-         return;
-       }
-       file = g_strdup(*paramlst);
-@@ -1540,30 +1540,25 @@
- 
-   if (!*paramlst) {
-     scr_LogPrint(LPRINT_NORMAL, "Wrong usage.");
-+    free_arg_lst(paramlst);
-     return;
-   }
- 
-   fjid = *paramlst;
-   msg = *(paramlst+1);
- 
--  if (!strncmp(fjid, "." JID_RESOURCE_SEPARATORSTR, 2))
--    expandfjid = TRUE;
--
--  if (expandfjid || !strcmp(fjid, ".")) {
--    const gchar *res = fjid+2;
--    fjid = NULL;
--    // Send the message to the current buddy
--    if (current_buddy)
--      fjid = (char*)buddy_getjid(BUDDATA(current_buddy));
-+  if (fjid[0] == '.') {
-+    const gchar *cjid = CURRENT_JID;
-+    if (fjid[1] == '\0')
-+      fjid = g_strdup(cjid);
-+    else if (fjid[1] == JID_RESOURCE_SEPARATOR) {
-+      char *res_utf8 = to_utf8(fjid+2);
-+      fjid = g_strdup_printf("%s%c%s", cjid, JID_RESOURCE_SEPARATOR, res_utf8);
-+      g_free(res_utf8);
-+    } else
-+      fjid = to_utf8(fjid);
-     if (!fjid) {
--      scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
--      free_arg_lst(paramlst);
--      return;
--    }
--    if (expandfjid && *res) {
--      char *res_utf8 = to_utf8(res);
--      fjid = g_strdup_printf("%s%c%s", fjid, JID_RESOURCE_SEPARATOR, res_utf8);
--      g_free(res_utf8);
-+      scr_log_print(LPRINT_NORMAL, "Please specify a Jabber ID.");
-     }
-   } else
-     fjid = to_utf8(fjid);

--- a/series	Mon Apr 05 16:37:28 2010 +0300
+++ b/series	Tue Apr 06 00:31:37 2010 +0300
@@ -1,4 +1,3 @@
-fix-say-to
 switch-to-experimental
 fifo-use-guard
 modularize-fifo