Mercurial > pidgin
comparison libpurple/protocols/silc/chat.c @ 17573:9a96d8711303
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 |
comparison
equal
deleted
inserted
replaced
17572:d74d716f814d | 17573:9a96d8711303 |
---|---|
1236 SilcUInt32 flags; | 1236 SilcUInt32 flags; |
1237 int ret = 0; | 1237 int ret = 0; |
1238 char *msg2, *tmp; | 1238 char *msg2, *tmp; |
1239 gboolean found = FALSE; | 1239 gboolean found = FALSE; |
1240 gboolean sign = purple_account_get_bool(sg->account, "sign-verify", FALSE); | 1240 gboolean sign = purple_account_get_bool(sg->account, "sign-verify", FALSE); |
1241 #ifdef HAVE_SILCMIME_H | |
1242 SilcDList list; | 1241 SilcDList list; |
1243 #endif | |
1244 | 1242 |
1245 if (!msg || !conn) | 1243 if (!msg || !conn) |
1246 return 0; | 1244 return 0; |
1247 | 1245 |
1248 flags = SILC_MESSAGE_FLAG_UTF8; | 1246 flags = SILC_MESSAGE_FLAG_UTF8; |
1307 return 0; | 1305 return 0; |
1308 } | 1306 } |
1309 channel = chu->channel; | 1307 channel = chu->channel; |
1310 } | 1308 } |
1311 | 1309 |
1312 #ifdef HAVE_SILCMIME_H | |
1313 /* Check for images */ | 1310 /* Check for images */ |
1314 if (msgflags & PURPLE_MESSAGE_IMAGES) { | 1311 if (msgflags & PURPLE_MESSAGE_IMAGES) { |
1315 list = silcpurple_image_message(msg, &flags); | 1312 list = silcpurple_image_message(msg, &flags); |
1316 if (list) { | 1313 if (list) { |
1317 /* Send one or more MIME message. If more than one, they | 1314 /* Send one or more MIME message. If more than one, they |
1332 if (ret) | 1329 if (ret) |
1333 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg, time(NULL)); | 1330 serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg, time(NULL)); |
1334 return ret; | 1331 return ret; |
1335 } | 1332 } |
1336 } | 1333 } |
1337 #endif | |
1338 | 1334 |
1339 /* Send channel message */ | 1335 /* Send channel message */ |
1340 ret = silc_client_send_channel_message(client, conn, channel, key, | 1336 ret = silc_client_send_channel_message(client, conn, channel, key, |
1341 flags, NULL, (unsigned char *)msg2, | 1337 flags, NULL, (unsigned char *)msg2, |
1342 strlen(msg2)); | 1338 strlen(msg2)); |