Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Removed Google Reader from online RSS readers.

Browse Source 
Also fixed uninitialized variable issue in AES interface.
This commit is contained in:
nowrep 2013-06-22 17:33:59 +02:00
parent 31d906b75b
commit eb2567939f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/rss/rssnotification.cpp
View File

@ -50,12 +50,6 @@ RSSNotification::RSSNotification(const QString &title, const QUrl &url, WebView*
bloglines.icon = QIcon(":/icons/sites/bloglines.png"); bloglines.icon = QIcon(":/icons/sites/bloglines.png");
bloglines.address = "http://www.bloglines.com/sub?url="; bloglines.address = "http://www.bloglines.com/sub?url=";
RssApp greader;
greader.type = WebApplication;
greader.title = "Google Reader";
greader.icon = QIcon(":/icons/sites/google.png");
greader.address = "http://www.google.com/ig/add?feedurl=";
RssApp myaol; RssApp myaol;
myaol.type = WebApplication; myaol.type = WebApplication;
myaol.title = "My AOL"; myaol.title = "My AOL";
@ -74,7 +68,7 @@ RSSNotification::RSSNotification(const QString &title, const QUrl &url, WebView*
yahoo.icon = QIcon(":/icons/sites/yahoo.png"); yahoo.icon = QIcon(":/icons/sites/yahoo.png");
yahoo.address = "http://add.my.yahoo.com/rss?url="; yahoo.address = "http://add.my.yahoo.com/rss?url=";
m_rssApps << bloglines << greader << myaol << netvibes << yahoo; m_rssApps << bloglines << myaol << netvibes << yahoo;
#ifdef QZ_WS_X11 #ifdef QZ_WS_X11
const QString &akregatorBin = QzTools::resolveFromPath("akregator"); const QString &akregatorBin = QzTools::resolveFromPath("akregator");

2
src/lib/tools/aesinterface.cpp
View File

@ -71,7 +71,7 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
return false; return false;
} }
int result; int result = 0;
if (evpMode == EVP_PKEY_MO_ENCRYPT) { if (evpMode == EVP_PKEY_MO_ENCRYPT) {
m_iVector = createRandomData(EVP_MAX_IV_LENGTH); m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData()); result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());