[SCM] muon packaging branch, master, updated. fecb6967b6d2f05711b66df5e98eb142a66d44c4

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit fecb6967b6d2f05711b66df5e98eb142a66d44c4
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Aug 4 18:37:23 2011 +0200

    Add list_properly_unofficial_sw_sources.diff
---
 .../list_properly_unofficial_sw_sources.diff       |   36 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/patches/list_properly_unofficial_sw_sources.diff b/debian/patches/list_properly_unofficial_sw_sources.diff
new file mode 100644
index 0000000..7280ed9
--- /dev/null
+++ b/debian/patches/list_properly_unofficial_sw_sources.diff
@@ -0,0 +1,36 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Forwarded: no
+Description: This patch makes muon-installer list properly unofficial packages'
+ origins. Probably this should be fixed in libqapt instead.
+---
+ installer/ApplicationWindow.cpp |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/installer/ApplicationWindow.cpp
++++ b/installer/ApplicationWindow.cpp
+@@ -253,7 +253,11 @@ void ApplicationWindow::populateViews()
+         QString originLabel = m_backend->originLabel(originName);
+         QStandardItem *viewItem = new QStandardItem;
+         viewItem->setEditable(false);
+-        viewItem->setText(originLabel);
++        if (originLabel.isEmpty()) {
++            viewItem->setText(originName);
++        } else {
++            viewItem->setText(originLabel);
++        }
+         viewItem->setData(originName, OriginFilterRole);
+         viewItem->setData(AppView, ViewTypeRole);
+ 
+@@ -318,7 +322,11 @@ void ApplicationWindow::populateViews()
+         QString originLabel = m_backend->originLabel(originName);
+         QStandardItem *viewItem = new QStandardItem;
+         viewItem->setEditable(false);
+-        viewItem->setText(originLabel);
++        if (originLabel.isEmpty()) {
++            viewItem->setText(originName);
++        } else {
++            viewItem->setText(originLabel);
++        }
+         viewItem->setData(QApt::Package::Installed, StateFilterRole);
+         viewItem->setData(originName, OriginFilterRole);
+         viewItem->setData(AppView, ViewTypeRole);
diff --git a/debian/patches/series b/debian/patches/series
index 8f76e5d..e56492f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_canonical_support_info.diff
 hide_changelog_tab.diff
 remove_reviews_section.diff
+list_properly_unofficial_sw_sources.diff

-- 
muon packaging