X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fjabber%2Fxmpp_messages.c;h=405856e9295fc3657a3047328b0efe8bc3c57b07;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=e9d3bf32604065e64729bb6253ee71ff10dc141f;hpb=a0c4dc941a09a70a5db5316c8e602cb775740e43;p=citadel.git

diff --git a/citadel/modules/jabber/xmpp_messages.c b/citadel/modules/jabber/xmpp_messages.c
index e9d3bf326..405856e92 100644
--- a/citadel/modules/jabber/xmpp_messages.c
+++ b/citadel/modules/jabber/xmpp_messages.c
@@ -3,8 +3,21 @@
  *
  * Handle messages sent and received using XMPP (Jabber) protocol
  *
- * Copyright (c) 2007 by Art Cancro
- * This code is released under the terms of the GNU General Public License.
+ * Copyright (c) 2007-2009 by Art Cancro
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 
@@ -33,6 +46,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -42,9 +56,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 
@@ -88,9 +99,13 @@ void jabber_send_message(char *message_to, char *message_body) {
 	if (message_body == NULL) return;
 	if (message_to == NULL) return;
 	if (IsEmptyStr(message_to)) return;
+	if (!CC->logged_in) return;
 
 	for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-		if (!strcasecmp(cptr->cs_inet_email, message_to)) {
+		if (	(cptr->logged_in)
+			&& (cptr->can_receive_im)
+			&& (!strcasecmp(cptr->cs_inet_email, message_to))
+		) {
 			recp = cptr->user.fullname;
 		}
 	}
@@ -102,8 +117,6 @@ void jabber_send_message(char *message_to, char *message_body) {
 	free(XMPP->message_body);
 	XMPP->message_body = NULL;
 	XMPP->message_to[0] = 0;
+	time(&CC->lastidle);
 }
 
-
-
-#endif	/* HAVE_EXPAT */