Mercurial > pidgin

diff libpurple/protocols/silc/chat.c @ 17573:9a96d8711303

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We now depend on SILC Toolkit 1.1 for this copy of this prpl so we can lose a whole bunch of "#ifdef SILC_ATTRIBUTE_USER_ICON" and "#ifdef HAVE_SILCMIME_H" because they will always be true
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 10 Jun 2007 01:54:40 +0000
parents d74d716f814d
children ab6d2763b8d8
line wrap: on
line diff
--- a/libpurple/protocols/silc/chat.c	Sat Jun 09 18:03:12 2007 +0000
+++ b/libpurple/protocols/silc/chat.c	Sun Jun 10 01:54:40 2007 +0000
@@ -1238,9 +1238,7 @@
 	char *msg2, *tmp;
 	gboolean found = FALSE;
 	gboolean sign = purple_account_get_bool(sg->account, "sign-verify", FALSE);
-#ifdef HAVE_SILCMIME_H
 	SilcDList list;
-#endif
 
 	if (!msg || !conn)
 		return 0;
@@ -1309,7 +1307,6 @@
 		channel = chu->channel;
 	}
 
-#ifdef HAVE_SILCMIME_H
 	/* Check for images */
 	if (msgflags & PURPLE_MESSAGE_IMAGES) {
 		list = silcpurple_image_message(msg, &flags);
@@ -1334,7 +1331,6 @@
 			return ret;
 		}
 	}
-#endif
 
 	/* Send channel message */
 	ret = silc_client_send_channel_message(client, conn, channel, key,