From eb2567939f36f5bde95930382e3ef781fe04a01b Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 22 Jun 2013 17:33:59 +0200 Subject: [PATCH] Removed Google Reader from online RSS readers. Also fixed uninitialized variable issue in AES interface. --- src/lib/rss/rssnotification.cpp | 8 +------- src/lib/tools/aesinterface.cpp | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/rss/rssnotification.cpp b/src/lib/rss/rssnotification.cpp index cd0c8c377..2290dfc56 100644 --- a/src/lib/rss/rssnotification.cpp +++ b/src/lib/rss/rssnotification.cpp @@ -50,12 +50,6 @@ RSSNotification::RSSNotification(const QString &title, const QUrl &url, WebView* bloglines.icon = QIcon(":/icons/sites/bloglines.png"); 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; myaol.type = WebApplication; 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.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 const QString &akregatorBin = QzTools::resolveFromPath("akregator"); diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp index 884e84db0..1879ce01e 100644 --- a/src/lib/tools/aesinterface.cpp +++ b/src/lib/tools/aesinterface.cpp @@ -71,7 +71,7 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra return false; } - int result; + int result = 0; if (evpMode == EVP_PKEY_MO_ENCRYPT) { m_iVector = createRandomData(EVP_MAX_IV_LENGTH); result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());