From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- extra/psi/affiliationlistconfigmuc.patch | 92 ----------- extra/psi/configureroomcrash.patch | 40 ----- extra/psi/gcc-47.patch | 10 -- extra/psi/input-validation.patch | 257 ------------------------------- 4 files changed, 399 deletions(-) delete mode 100644 extra/psi/affiliationlistconfigmuc.patch delete mode 100644 extra/psi/configureroomcrash.patch delete mode 100644 extra/psi/gcc-47.patch delete mode 100644 extra/psi/input-validation.patch (limited to 'extra/psi') diff --git a/extra/psi/affiliationlistconfigmuc.patch b/extra/psi/affiliationlistconfigmuc.patch deleted file mode 100644 index dd9119e78..000000000 --- a/extra/psi/affiliationlistconfigmuc.patch +++ /dev/null @@ -1,92 +0,0 @@ -commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4 -Author: Rion -Date: Fri Dec 3 16:39:56 2010 +0500 - - Fixed changing affiliations list from muc config dialog - -diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp -index 8632c43..94adcec 100644 ---- a/src/mucaffiliationsview.cpp -+++ b/src/mucaffiliationsview.cpp -@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent) - setDropIndicatorShown(true); - } - --bool MUCAffiliationsView::addToCurrent(const QString& j) --{ -- QModelIndex index = currentIndex(); -- if (!index.isValid()) -- return false; -- -- if (index.parent().isValid()) -- index = index.parent(); -- -- if (!index.parent().isValid()) { -- XMPP::Jid jid(j); -- if (!jid.isValid()) -- return false; -- -- // TODO: Check if the user is already in the list -- -- int row = model()->rowCount(index); -- model()->insertRows(row,1,index); -- model()->setData(model()->index(row,0,index),QVariant(jid.bare())); -- return true; -- } -- return false; --} -- - void MUCAffiliationsView::removeCurrent() - { - QModelIndex index = currentIndex(); -diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h -index 11f1446..54ee0ff 100644 ---- a/src/mucaffiliationsview.h -+++ b/src/mucaffiliationsview.h -@@ -32,7 +32,6 @@ public: - - public slots: - void removeCurrent(); -- bool addToCurrent(const QString&); - - signals: - void addEnabled(bool); -diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp -index a10f14e..dcf4a35 100644 ---- a/src/mucconfigdlg.cpp -+++ b/src/mucconfigdlg.cpp -@@ -158,9 +158,31 @@ void MUCConfigDlg::add() - { - bool ok; - QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok); -- if (ok) { -- if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text)) -- QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); -+ if (ok && ui_.tv_affiliations->currentIndex().isValid()) { -+ if (!text.isEmpty()) { -+ -+ QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex()); -+ -+ if (index.parent().isValid()) -+ index = index.parent(); -+ -+ if (!index.parent().isValid()) { -+ XMPP::Jid jid(text); -+ if (jid.isValid()) { -+ -+ // TODO: Check if the user is already in the list -+ -+ int row = affiliations_model_->rowCount(index); -+ affiliations_model_->insertRows(row,1,index); -+ QModelIndex newIndex = affiliations_model_->index(row,0,index); -+ affiliations_model_->setData(newIndex, QVariant(jid.bare())); -+ ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex)); -+ return; -+ } -+ } -+ } -+ -+ QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID.")); - } - } - diff --git a/extra/psi/configureroomcrash.patch b/extra/psi/configureroomcrash.patch deleted file mode 100644 index 99fa30794..000000000 --- a/extra/psi/configureroomcrash.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd -Author: Michail Pishchagin -Date: Tue Oct 19 11:26:31 2010 +0400 - - Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087) - Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+ - -diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp -index 722b762..fd0a830 100644 ---- a/src/mucaffiliationsmodel.cpp -+++ b/src/mucaffiliationsmodel.cpp -@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists() - - void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a) - { -+ emit layoutAboutToBeChanged(); - enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false; - QModelIndex index = affiliationListIndex(a); - if (hasChildren(index)) { - removeRows(0,rowCount(index),index); - } -+ emit layoutChanged(); - } - - void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b) - { -+ emit layoutAboutToBeChanged(); - QModelIndex index = affiliationListIndex(a); - enabled_[(AffiliationListIndex) index.row()] = b; - emit layoutChanged(); -@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList& items) - foreach(MUCItem item, items) { - QModelIndex list = affiliationListIndex(item.affiliation()); - if (list.isValid() && !item.jid().isEmpty()) { -+ if (!dirty) { -+ emit layoutAboutToBeChanged(); -+ } - int row = rowCount(list); - if (row == 0) { - enabled_[(AffiliationListIndex) list.row()] = true; diff --git a/extra/psi/gcc-47.patch b/extra/psi/gcc-47.patch deleted file mode 100644 index 64cb83fba..000000000 --- a/extra/psi/gcc-47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- iris/src/irisnet/corelib/netinterface_unix.cpp.orig 2012-01-07 19:46:39.493999646 +0100 -+++ iris/src/irisnet/corelib/netinterface_unix.cpp 2012-01-07 19:46:57.251002321 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - // for solaris - #ifndef SIOCGIFCONF diff --git a/extra/psi/input-validation.patch b/extra/psi/input-validation.patch deleted file mode 100644 index 7260c80e1..000000000 --- a/extra/psi/input-validation.patch +++ /dev/null @@ -1,257 +0,0 @@ -commit c68fdd9926a38b2820bc5df97fd1905355a2640d -Author: rion -Date: Fri Oct 7 22:19:05 2011 +0600 - - Fixed QLabel CVE - ---- src/Certificates/CertificateDisplay.ui 2011-10-19 08:30:15 +0000 -+++ src/Certificates/CertificateDisplay.ui 2011-10-19 08:31:23 +0000 -@@ -1,105 +1,118 @@ -- -+ -+ - CertificateDisplay -- -- -+ -+ - - 0 - 0 -- 518 -+ 525 - 369 - - -- -+ - Certificate Information - -- -- -+ -+ -+ 6 -+ -+ - 11 - -- -- 6 -- - -- -- -+ -+ -+ 6 -+ -+ - 0 - -- -- 6 -- - -- -- -+ -+ -+ 6 -+ -+ - 0 - -- -- 6 -- - -- -- -+ -+ - Certificate Validation: - - - - -- -- -+ -+ - - -+ -+ Qt::PlainText -+ - - - -- -- -+ -+ - Valid From: - - - - -- -- -+ -+ - - -+ -+ Qt::PlainText -+ - - - -- -- -+ -+ - Valid Until: - - - - -- -- -+ -+ - - -+ -+ Qt::PlainText -+ - - - -- -- -+ -+ - Serial Number: - - - - -- -- -+ -+ - - -+ -+ Qt::PlainText -+ - - - - -- -+ - Qt::Vertical - -- -+ - QSizePolicy::Expanding - -- -+ - - 20 - 106 -@@ -110,14 +123,14 @@ - - - -- -- -+ -+ - - 350 - 300 - - -- -+ - Qt::ScrollBarAlwaysOff - - -@@ -125,35 +138,35 @@ - - - -- -- -+ -+ - QFrame::HLine - -- -+ - QFrame::Sunken - -- -+ - Qt::Horizontal - - - - -- -- -+ -+ -+ 6 -+ -+ - 0 - -- -- 6 -- - - -- -+ - Qt::Horizontal - -- -+ - QSizePolicy::Expanding - -- -+ - - 421 - 20 -@@ -162,17 +175,17 @@ - - - -- -- -- Close -- -- -+ -+ -+ Close -+ -+ - - - - - -- -+ - qPixmapFromMimeSource - - tb_cert - -- cgit v1.2.3-54-g00ecf