Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/jabglue.c @ 1053:1ec7ec9bda60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup/cosmetics
author Mikael Berthe <mikael@lilotux.net>
date Mon, 27 Nov 2006 20:55:33 +0100
parents c8a8edd5c50d
children 6eb1efea75d0
comparison
equal deleted inserted replaced
1052:c8a8edd5c50d 1053:1ec7ec9bda60
1485 xmlnode xmldata_signed) 1485 xmlnode xmldata_signed)
1486 { 1486 {
1487 char *jid; 1487 char *jid;
1488 const char *rname, *s; 1488 const char *rname, *s;
1489 char *decrypted = NULL; 1489 char *decrypted = NULL;
1490 /* bool sigchecked = FALSE; */
1491 1490
1492 jid = jidtodisp(from); 1491 jid = jidtodisp(from);
1493 1492
1494 rname = strchr(from, JID_RESOURCE_SEPARATOR); 1493 rname = strchr(from, JID_RESOURCE_SEPARATOR);
1495 if (rname) rname++; 1494 if (rname) rname++;
1497 #ifdef HAVE_GPGME 1496 #ifdef HAVE_GPGME
1498 if (enc && gpg_enabled()) { 1497 if (enc && gpg_enabled()) {
1499 decrypted = gpg_decrypt(enc); 1498 decrypted = gpg_decrypt(enc);
1500 if (decrypted) { 1499 if (decrypted) {
1501 body = decrypted; 1500 body = decrypted;
1502 /*
1503 if (xmldata_signed) {
1504 check_signature(jid, rname, xmldata_signed, decrypted);
1505 sigchecked = TRUE;
1506 }
1507 */
1508 } 1501 }
1509 } 1502 }
1510 // Check signature of an unencrypted message 1503 // Check signature of an unencrypted message
1511 if (xmldata_signed /* && !sigchecked */ && gpg_enabled()) 1504 if (xmldata_signed && gpg_enabled())
1512 check_signature(jid, rname, xmldata_signed, decrypted); 1505 check_signature(jid, rname, xmldata_signed, decrypted);
1513 #endif 1506 #endif
1514 1507
1515 // Check for unexpected groupchat messages 1508 // Check for unexpected groupchat messages
1516 // If we receive a groupchat message from a room we're not a member of, 1509 // If we receive a groupchat message from a room we're not a member of,