comparison: libpurple/protocols/mxit/client.c
libpurple/protocols/mxit/client.c
- branch
- soc.2013.gobjectification.plugins
- changeset 37130
- 7ed9e7b31bad
- parent 35678
- 97cb9646c26f
- parent 37103
- cdc96a002b33
- child 37131
- fe9ff76f1c6c
equal
deleted
inserted
replaced
| 37129:edbea75bd68f | 37130:7ed9e7b31bad |
|---|---|
| 1543 g_snprintf( msg, sizeof( msg ), _( "%s sent you an encrypted message, but it is not supported on this client." ), name ); | 1543 g_snprintf( msg, sizeof( msg ), _( "%s sent you an encrypted message, but it is not supported on this client." ), name ); |
| 1544 mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Message Error" ), msg ); | 1544 mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Message Error" ), msg ); |
| 1545 return; | 1545 return; |
| 1546 } | 1546 } |
| 1547 else if ( msgflags & CP_MSG_TL_ENCRYPTED ) { | 1547 else if ( msgflags & CP_MSG_TL_ENCRYPTED ) { |
| 1548 /* this is a transport-layer encrypted message. */ | 1548 /* This is a transport-layer encrypted message. We don't support |
| 1549 message = mxit_decrypt_message( session, message ); | 1549 * it anymore, because original client doesn't look like it was. */ |
| 1550 if ( !message ) { | 1550 purple_serv_got_im(session->con, sender, |
| 1551 /* could not be decrypted */ | 1551 _("An encrypted message was received which could not be decrypted."), |
| 1552 purple_serv_got_im( session->con, sender, _( "An encrypted message was received which could not be decrypted." ), PURPLE_MESSAGE_ERROR, time( NULL ) ); | 1552 PURPLE_MESSAGE_ERROR, time(NULL)); |
| 1553 return; | 1553 return; |
| 1554 } | |
| 1555 } | 1554 } |
| 1556 | 1555 |
| 1557 if ( msgflags & CP_MSG_NOTIFY_DELIVERY ) { | 1556 if ( msgflags & CP_MSG_NOTIFY_DELIVERY ) { |
| 1558 /* delivery notification is requested */ | 1557 /* delivery notification is requested */ |
| 1559 if ( records[0]->fcount >= 4 ) | 1558 if ( records[0]->fcount >= 4 ) |
